The three window control buttons normally are moved to the Tab bar if you hide the Menu bar.

Start Firefox in Troubleshoot Mode to check if one of the extensions ("3-bar" menu button or Tools -> Add-ons -> Extensions) or if hardware acceleration or if userChrome.css/userContent.css is causing the problem.

• switch to the Default System theme: "3-bar" menu button or Tools -> Add-ons -> Themes
• do NOT click the "Refresh Firefox" button on the Troubleshoot Mode start window

• https://support.mozilla.org/en-US/kb/diagnose-firefox-issues-using-troubleshoot-mode
• https://support.mozilla.org/en-US/kb/troubleshoot-extensions-themes-to-fix-problems

I assume that is the "before" picture because I do see an X there. Or does it not work?

If you move the tab bar to a different position using a userChrome.css file, your rules might need adjusting.