Merge "Display correct icons in grid view." into nyc-dev