side marker light attachment

[gjz30075]

The picture shows a rear Federal side marker light and how it attaches to the body. Basically the 'bucket' of the light
has a flange on the outside of the body and is held on with the shown brackets that get pop riveted to the 'bucket', hence sandwiching the light.
So, the question: has anyone come up with a better way than the pop rivets to hold the light in place?

Utilizing the little brackets, I'm envisioning maybe a small nut/bolt arrangement to somehow squeeze the bracket to the bucket, but open to any other ideas.

Any ideas welcome

Greg Z