I've always assumed it depends on what your context is. If your perspective is the country that the immigrant is from, then they would be an expat. If you are in context of the other country they are an immigrant.
Ie
"My friend is an expat who went off to The Netherlands." "My friend is an immigrant that came here from The USA."
All good until Mr Resetti shows up to scold you.