diff --git a/lib/screens/repeater_settings_screen.dart b/lib/screens/repeater_settings_screen.dart
index deaa245..a7c1885 100644
--- a/lib/screens/repeater_settings_screen.dart
+++ b/lib/screens/repeater_settings_screen.dart
@@ -547,7 +547,7 @@ class _RepeaterSettingsScreenState extends State<RepeaterSettingsScreen> {
   }) {
     return Row(
       children: [
-        Icon(icon, color: Theme.of(context).primaryColor),
+        Icon(icon, color: Theme.of(context).textTheme.headlineSmall?.color),
         const SizedBox(width: 8),
         Text(
           title,
diff --git a/lib/screens/repeater_status_screen.dart b/lib/screens/repeater_status_screen.dart
index c9a592f..ddb1784 100644
--- a/lib/screens/repeater_status_screen.dart
+++ b/lib/screens/repeater_status_screen.dart
@@ -417,7 +417,7 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {
           children: [
             Row(
               children: [
-                Icon(Icons.info_outline, color: Theme.of(context).primaryColor),
+                Icon(Icons.info_outline, color: Theme.of(context).textTheme.headlineSmall?.color),
                 const SizedBox(width: 8),
                 const Text(
                   'System Information',
@@ -446,7 +446,7 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {
           children: [
             Row(
               children: [
-                Icon(Icons.radio, color: Theme.of(context).primaryColor),
+                Icon(Icons.radio, color: Theme.of(context).textTheme.headlineSmall?.color),
                 const SizedBox(width: 8),
                 const Text(
                   'Radio Statistics',
@@ -475,7 +475,7 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {
           children: [
             Row(
               children: [
-                Icon(Icons.analytics, color: Theme.of(context).primaryColor),
+                Icon(Icons.analytics, color: Theme.of(context).textTheme.headlineSmall?.color),
                 const SizedBox(width: 8),
                 const Text(
                   'Packet Statistics',