I am going to work on a PR for this but a good idea to get an issue to hook into. This builds on from #18491 and will have:

• Light style with arrow
• Dark style with arrow

This does depend on #18466 being resolved.