See commits. There's a bunch of fixes (for #3165 (closed) and other unreported issues) and visual behavioral improvements (#3092 (closed)). There are more visual changes in the queue, but they're GNOME 40 material.
This whole file is growing large, I want to do a deeper cleanup during the GNOME 40 cycle. For now, though, let's focus on making it a bit better and bug-free.