Merge "Update grid mode and list mode icon"