I always decant my AS from the plastic bottles to cobalt blue glass bottles with spray tops. I have a couple of small funnels to do this with - you have to be sure the ends of the funnels fit in the whole of the "decanter". And, be careful not to overfill or you end up with a mess. I think my wife got the funnels at The Container Store, if you have any of those nearby.
My girlfriend picked up a "Perfume funnel" at Bed Bath and Beyond for me to decant my aftershaves. Works like a charm! You have to go slow, but shouldn't spill any that way. I used both vintage Avon bottles and clear bottles with orifice reducers to decant mine. The only one I've noticed a real difference in was the VEG