I don't know which came first, but everything in the "Amarige" bottle (slightly round) is vintage and excellent. The ones I have are like the second pic (though the box says vaporisateur).
Then came a more squarish bottle, though you see it rarerly; I have not smelled it, but I heard it's ok. Finally, it appeared in the mithique series; I have not smelled this version. Btw, as you well know, be careful of stock photos on ebay, they need not correspond to the actual bottle. In the case of insense, though, most of what's around is the original one, later ones had limited distribution.