Toolbar layout #2 (v9.5.0)

[IanOfYork]

Sometimes, I do close TextPad. Generally this results in the toolbars being "re-organised".
Generally, a couple get swapped. Normally one or both are custom toolbars.
The "airgap" is normally lost as well.

See also #13952.
Logged as two bugs — while seemly related, they may have different causes.