Simple TPU adapter to replace the cheap rubber adapters on the cheap button snap kits you can get on Amazon/Aliexpress.  The original ones would not hold the buttons in place and would always fall out, so this should fix the problems with that.