Merge "Pass in context when loading icons from Tile"