Here is how it looks like now:
Works fine with dark theme too, although I used a common style for all variants: