The topology dark theme PR #7294 was merged and after that a few comments were added, so this issue is to address some of those comments.
Note that some of the comments on that PR are visually breaking color changes to the default (light) theme so should be revisited later.
