fix icons now showing + location bug