1st thing you have to do is:
about:config

browser.tabs.closeButtons -> 3

That puts the close button back on the right,