Icon fixes
fixed search results for grid
Merge remote-tracking branch 'upstream/master'