Fix for search field reset icon (without conflict)
Compiled @caouecs pull request
Merge branch 'hotfix/2.2.17'