diff --git a/src/TramlineFive/TramlineFive.Maui/App.xaml.cs b/src/TramlineFive/TramlineFive.Maui/App.xaml.cs
index 5582ce0..b1a3235 100644
--- a/src/TramlineFive/TramlineFive.Maui/App.xaml.cs
+++ b/src/TramlineFive/TramlineFive.Maui/App.xaml.cs
@@ -37,7 +37,8 @@ public App(PathService dbPathService)
WeakReferenceMessenger.Default.Send(new ChangeThemeMessage(theme));
Current.RequestedThemeChanged += (s, a) =>
{
- WeakReferenceMessenger.Default.Send(new ChangeThemeMessage(a.RequestedTheme == AppTheme.Light ? Names.LightTheme : Names.DarkTheme));
+ if (Preferences.Get(Settings.Theme, Names.SystemDefault) == Names.SystemDefault)
+ WeakReferenceMessenger.Default.Send(new ChangeThemeMessage(a.RequestedTheme == AppTheme.Light ? Names.LightTheme : Names.DarkTheme));
};
System.Diagnostics.Debug.WriteLine("creating task");
diff --git a/src/TramlineFive/TramlineFive.Maui/AppShell.xaml b/src/TramlineFive/TramlineFive.Maui/AppShell.xaml
index 89871ff..4e7c515 100644
--- a/src/TramlineFive/TramlineFive.Maui/AppShell.xaml
+++ b/src/TramlineFive/TramlineFive.Maui/AppShell.xaml
@@ -13,11 +13,11 @@
+ Value="{DynamicResource IconsColor}" />
+ Value="{DynamicResource IconsColor}" />