Both. An Ice Giant is a subclassification of a Gas Giant. Ice giants are primarily composed of water, ammonia and methane. The helium and hydrogen that make up their atmospheres are in the outermost regions of the planets.
Neptune is it's own gas giant. A gas giant is a giant planet made of, well, gas. Did you know all of the gas giants [Jupiter, Saturn, Uranus, Neptune] have rings?