Merge pull request #3176 from techee/autocomplete_icon