window switches pop off if too much pressure applied rolling up

my F12 has had this issue for a long time. i trained myself not to pull too hard on the switches but valets don't understand and always pop off my switches. i am guess the retention plastic bit has worn down but i'm not 100% sure.

i've tried superglue around the square post that it sits on but it doesn't work.

anyone have a permanent fix?

 

i am going to order this part for my 2016 F12 my switches are the old design that pop off with the square post in the middle. will these replacements fit? or are these replacements the screw in newer design?

https://www.scuderiacarparts.com/part/233972/ferrari/302236/rh-power-window-switch.html#diagram

 

the switches are totally different on the F12

 

wanted to update on this. this link in the post above is what is showing on scuderia parts as the only replacement for F12 window switch: part number 302236 and 302237
however i am attaching an image of the part from ebay and it looks slightly smaller, no chrome edges, and the tabs on the back look different
i do not believe this is the right part at least for my 2016 F12.

ebay also has different part numbers for F12 window switches: part number 267782 and 267781
the images attached look exactly like my switches, chrome edges, same tabs on the back.
when i do a part search in scuderiaparts these links come up which are totally different from the schematic link above, and these parts aren't linked to any schematic at all:
https://www.scuderiacarparts.com/part/239851/ferrari/267782/rh-power-window-button.html
https://www.scuderiacarparts.com/part/239852/ferrari/267781/lh-power-window-button.html
i think these are the correct OEM replacement switches