Address part of #1299 in the default and dark theme