So I broke the lens and inadvertently the light as well for my right side...I am thinking about replacing with the matte black version...any suggestion as to where to buy from? And does the replacement come with new lens and light?

As you can see in the photos above, you need to preserve your light and install it into the new black housing. Photo 12 and 13.