PlayStation Face Buttons on RP5

Does anybody know whether the RP4P face buttons will be a direct swap for the RP5?

I'm looking at perfecting my 16bit to turn it into the retro PS handheld I've always dreamt of.

These coloured options from an Etsy seller look sublime with the grey body.

https://preview.redd.it/k4v54ih38pzd1.jpg?width=783&format=pjpg&auto=webp&s=3904aaf574fdfb1c12df9d3b23e848bd226b39be