Thanks guys, 18350 works for me, too. Should edit that in my initial description…

The Astrolux is looking better with that magnetic tailcap insert. It goes on the outside, right, not in the tube? So the plastic switch is basically surrounded by the magnetic ring?