diff --git a/lib/ui/app/app_bottom_bar.dart b/lib/ui/app/app_bottom_bar.dart
index 41ffa9597..4f9b8a3f3 100644
--- a/lib/ui/app/app_bottom_bar.dart
+++ b/lib/ui/app/app_bottom_bar.dart
@@ -476,7 +476,10 @@ class _AppBottomBarState extends State<AppBottomBar> {
                       onPressed: _onColumnsPressed,
                       child: Text(
                         localization.columns,
-                        style: TextStyle(color: state.linkColor),
+                        style: TextStyle(
+                            color: state.prefState.enableDarkMode
+                                ? Colors.white
+                                : Colors.black),
                       ),
                     )
                   else
diff --git a/lib/ui/app/main_screen.dart b/lib/ui/app/main_screen.dart
index 4009d0f1a..b18d7d348 100644
--- a/lib/ui/app/main_screen.dart
+++ b/lib/ui/app/main_screen.dart
@@ -664,6 +664,8 @@ class _EntityFilter extends StatelessWidget {
             ? state.accentColor
             : Theme.of(context).cardColor;
 
+    print('enableDarkMode: ${state.prefState.enableDarkMode} + hasAccentColor: ${state.hasAccentColor}');
+
     return Material(
       color: backgroundColor,
       child: AnimatedContainer(
@@ -709,22 +711,22 @@ class _EntityFilter extends StatelessWidget {
                   ),
                   actions: [
                     PopupMenuButton<EntityType>(
-                      child: Row(
-                        children: [
-                          Text(
-                            routeEntityType == filterEntityType
-                                ? localization.overview
-                                : '${localization.lookup(routeEntityType.plural)}',
-                            style: TextStyle(
-                                fontSize: 17,
-                                color: state.prefState.enableDarkMode ||
-                                        state.hasAccentColor
-                                    ? Colors.white
-                                    : Theme.of(context).accentColor),
-                          ),
-                          SizedBox(width: 4),
-                          Icon(Icons.arrow_drop_down),
-                        ],
+                      child: Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 8),
+                        child: Row(
+                          children: [
+                            Text(
+                              routeEntityType == filterEntityType
+                                  ? localization.overview
+                                  : '${localization.lookup(routeEntityType.plural)}',
+                              style: TextStyle(
+                                  fontSize: 17,
+                                  color: state.headerTextColor),
+                            ),
+                            SizedBox(width: 4),
+                            Icon(Icons.arrow_drop_down),
+                          ],
+                        ),
                       ),
                       initialValue: routeEntityType,
                       onSelected: (EntityType value) {