settings: Simplify ui XML a bit
This is in !1250 and I hit it with another bit I'm working on so let's split this out and rather rebase MRs on top of it.
This is in !1250 and I hit it with another bit I'm working on so let's split this out and rather rebase MRs on top of it.