T120 Headlamp Bucket

Hi all, love to ride my 2016 T120 especially after changing the tires to Avon Spirits and upping the rear sprocket by a couple of teeth. But while looking for a chafed wire in the headlamp bucket as someone suggested for my no longer working heated grips ( they still should be working after 12,000 miles !) I snapped the cheap plastic tab that holds the lamp tight on the top side .Anyone else do this and happen to know of an aftermarket good looking bucket? Just an FYI my flashers or warning lights as some call them stopped working but that seems to be a fairly common problem . Another item that should be working after 12,000 miles . Just venting basically. Cheers.