Correct the blue filter entity type selector on web

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

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,6 +711,8 @@ class _EntityFilter extends StatelessWidget {
                   ),
                   actions: [
                     PopupMenuButton<EntityType>(
+                      child: Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 8),
                         child: Row(
                           children: [
                             Text(
@@ -717,15 +721,13 @@ class _EntityFilter extends StatelessWidget {
                                   : '${localization.lookup(routeEntityType.plural)}',
                               style: TextStyle(
                                   fontSize: 17,
-                                color: state.prefState.enableDarkMode ||
+                                  color: state.headerTextColor),
-                                        state.hasAccentColor
-                                    ? Colors.white
-                                    : Theme.of(context).accentColor),
                             ),
                             SizedBox(width: 4),
                             Icon(Icons.arrow_drop_down),
                           ],
                         ),
+                      ),
                       initialValue: routeEntityType,
                       onSelected: (EntityType value) {
                         if (value == filterEntityType) {