That was actually one of the solutions another user posted, re changing the footer. Like you, I also wasn’t a fan of that method, given the nature of it breaking again if it ever gets updated.
I found this to be a better solution for now (Below). Just keep the layout according to the menu item set to Xbox mode, and it will work fine, regardless of what updated come out. Just make sure you reconfigure your emulators accordingly.