I bought just the lenses from lampsandlenses.com and replaced them on the original housing units. A bit of pain when the bolts started spinning inside the housing, so I had to cut those (Dremmel tool) and then replace with stainless (West Marine) which heads I epoxied in the housing so they don't spin. The old lens needs to be popped of, I had to cut it up with Dremmel disk along the perimeter. Sealed with marine sealant such as 3M 4200. Your marking lights reflective surfaces are likely deteriorated, so either get new, or as I did apply foil with glue. I followed instructions from one of the famous Volvo maintenance pages somewhere out there.