diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountScreen.kt
index f3002b67..7ff1b672 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountScreen.kt
@@ -144,16 +144,20 @@ private fun AccountScreen(
                     title = {
                         Text(
                             text = acc.text(),
-                            color = LocalCustomColors.current.light,
                             fontWeight = FontWeight.Bold
                         )
                     },
+                    colors = TopAppBarDefaults.topAppBarColors(
+                        containerColor = LocalCustomColors.current.primary,
+                        navigationIconContentColor = LocalCustomColors.current.onPrimary,
+                        titleContentColor = LocalCustomColors.current.onPrimary,
+                        actionIconContentColor = LocalCustomColors.current.onPrimary
+                    ),
                     navigationIcon = {
                         IconButton(onClick = onBack) {
                             Icon(
                                 imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                                 contentDescription = null,
-                                tint = LocalCustomColors.current.light
                             )
                         }
                     },
@@ -162,14 +166,10 @@ private fun AccountScreen(
                         IconButton(onClick = checkOnClick) {
                             Icon(
                                 imageVector = Icons.Filled.Check,
-                                tint = LocalCustomColors.current.light,
                                 contentDescription = "Check"
                             )
                         }
                     },
-                    colors = TopAppBarDefaults.topAppBarColors(
-                        containerColor = LocalCustomColors.current.primary
-                    )
                 )
             }
         }
diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountsScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountsScreen.kt
index ebf2e5e5..e4d83ebe 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountsScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountsScreen.kt
@@ -82,22 +82,22 @@ fun AccountsScreen(navController: NavController) {
                     title = {
                         Text(
                             text = stringResource(R.string.accounts),
-                            color = LocalCustomColors.current.light,
                             fontWeight = FontWeight.Bold
                         )
                     },
+                    colors = TopAppBarDefaults.topAppBarColors(
+                        containerColor = LocalCustomColors.current.primary,
+                        navigationIconContentColor = LocalCustomColors.current.onPrimary,
+                        titleContentColor = LocalCustomColors.current.onPrimary,
+                    ),
                     navigationIcon = {
                         IconButton(onClick = { navController.popBackStack() }) {
                             Icon(
                                 imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                                 contentDescription = null,
-                                tint = LocalCustomColors.current.light
                             )
                         }
                     },
-                    colors = TopAppBarDefaults.topAppBarColors(
-                        containerColor = LocalCustomColors.current.primary
-                    ),
                     windowInsets = WindowInsets(0, 0, 0, 0)
                 )
             }
diff --git a/app/src/main/kotlin/com/tutpro/baresip/AndroidContactScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/AndroidContactScreen.kt
index d4338fd1..cab2e06e 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AndroidContactScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AndroidContactScreen.kt
@@ -103,12 +103,13 @@ private fun TopAppBar(title: String, navController: NavController) {
         title = {
             Text(
                 text = title,
-                color = LocalCustomColors.current.light,
                 fontWeight = FontWeight.Bold
             )
         },
         colors = TopAppBarDefaults.topAppBarColors(
-            containerColor = LocalCustomColors.current.primary
+            containerColor = LocalCustomColors.current.primary,
+            navigationIconContentColor = LocalCustomColors.current.onPrimary,
+            titleContentColor = LocalCustomColors.current.onPrimary,
         ),
         windowInsets = WindowInsets(0, 0, 0, 0),
         navigationIcon = {
@@ -116,7 +117,6 @@ private fun TopAppBar(title: String, navController: NavController) {
                 Icon(
                     imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                     contentDescription = "Back",
-                    tint = LocalCustomColors.current.light
                 )
             }
         }
diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipContactScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipContactScreen.kt
index 5352d228..5fe4b231 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipContactScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipContactScreen.kt
@@ -231,12 +231,14 @@ private fun TopAppBar(title: String, onBack: () -> Unit, onCheck: () -> Unit) {
         title = {
             Text(
                 text = title,
-                color = LocalCustomColors.current.light,
                 fontWeight = FontWeight.Bold
             )
         },
         colors = TopAppBarDefaults.topAppBarColors(
-            containerColor = LocalCustomColors.current.primary
+            containerColor = LocalCustomColors.current.primary,
+            navigationIconContentColor = LocalCustomColors.current.onPrimary,
+            titleContentColor = LocalCustomColors.current.onPrimary,
+            actionIconContentColor = LocalCustomColors.current.onPrimary
         ),
         windowInsets = WindowInsets(0, 0, 0, 0),
         navigationIcon = {
@@ -244,7 +246,6 @@ private fun TopAppBar(title: String, onBack: () -> Unit, onCheck: () -> Unit) {
                 Icon(
                     imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                     contentDescription = "Back",
-                    tint = LocalCustomColors.current.light
                 )
             }
         },
@@ -252,7 +253,6 @@ private fun TopAppBar(title: String, onBack: () -> Unit, onCheck: () -> Unit) {
             IconButton(onClick = onCheck) {
                 Icon(
                     imageVector = Icons.Filled.Check,
-                    tint = LocalCustomColors.current.light,
                     contentDescription = "Check"
                 )
             }
diff --git a/app/src/main/kotlin/com/tutpro/baresip/CallDetailsScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/CallDetailsScreen.kt
index 2b953a28..5e90e79b 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/CallDetailsScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/CallDetailsScreen.kt
@@ -82,12 +82,13 @@ private fun CallDetailsScreen(navController: NavController, callRow: CallRow) {
                     title = {
                         Text(
                             text = stringResource(R.string.call_details),
-                            color = LocalCustomColors.current.light,
                             fontWeight = FontWeight.Bold
                         )
                     },
                     colors = TopAppBarDefaults.topAppBarColors(
-                        containerColor = LocalCustomColors.current.primary
+                        containerColor = LocalCustomColors.current.primary,
+                        navigationIconContentColor = LocalCustomColors.current.onPrimary,
+                        titleContentColor = LocalCustomColors.current.onPrimary,
                     ),
                     windowInsets = WindowInsets(0, 0, 0, 0),
                     navigationIcon = {
@@ -95,7 +96,6 @@ private fun CallDetailsScreen(navController: NavController, callRow: CallRow) {
                             Icon(
                                 imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                                 contentDescription = "Back",
-                                tint = LocalCustomColors.current.light
                             )
                         }
                     },
diff --git a/app/src/main/kotlin/com/tutpro/baresip/CallsScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/CallsScreen.kt
index 436b415f..60c3fbda 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/CallsScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/CallsScreen.kt
@@ -148,12 +148,14 @@ private fun TopAppBar(navController: NavController, account: Account, callHistor
         title = {
             Text(
                 text = stringResource(R.string.call_history),
-                color = LocalCustomColors.current.light,
                 fontWeight = FontWeight.Bold
             )
         },
         colors = TopAppBarDefaults.topAppBarColors(
-            containerColor = LocalCustomColors.current.primary
+            containerColor = LocalCustomColors.current.primary,
+            navigationIconContentColor = LocalCustomColors.current.onPrimary,
+            titleContentColor = LocalCustomColors.current.onPrimary,
+            actionIconContentColor = LocalCustomColors.current.onPrimary
         ),
         windowInsets = WindowInsets(0, 0, 0, 0),
         navigationIcon = {
@@ -166,7 +168,6 @@ private fun TopAppBar(navController: NavController, account: Account, callHistor
                 Icon(
                     imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                     contentDescription = "Back",
-                    tint = LocalCustomColors.current.light
                 )
             }
         },
@@ -177,7 +178,6 @@ private fun TopAppBar(navController: NavController, account: Account, callHistor
                 Icon(
                     imageVector = Icons.Filled.Menu,
                     contentDescription = "Menu",
-                    tint = LocalCustomColors.current.light
                 )
             }
             CustomElements.DropdownMenu(
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatScreen.kt
index 4660c30b..2939ef94 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ChatScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ChatScreen.kt
@@ -222,20 +222,21 @@ private fun TopAppBar(
         title = {
             Text(
                 text = format(ctx.getString(R.string.chat_with), Utils.friendlyUri(ctx, peerUri, account)),
-                color = LocalCustomColors.current.light,
                 fontSize = 22.sp,
                 fontWeight = FontWeight.Bold
             )
         },
         colors = TopAppBarDefaults.topAppBarColors(
-            containerColor = LocalCustomColors.current.primary
+            containerColor = LocalCustomColors.current.primary,
+            navigationIconContentColor = LocalCustomColors.current.onPrimary,
+            titleContentColor = LocalCustomColors.current.onPrimary,
+            actionIconContentColor = LocalCustomColors.current.onPrimary
         ),
         navigationIcon = {
             IconButton(onClick = { backAction(navController, account, peerUri) }) {
                 Icon(
                     imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                     contentDescription = "Back",
-                    tint = LocalCustomColors.current.light
                 )
             }
         },
@@ -261,7 +262,6 @@ private fun TopAppBar(
                 Icon(
                     imageVector = ImageVector.vectorResource(R.drawable.call_small),
                     contentDescription = "Call",
-                    tint = LocalCustomColors.current.light
                 )
             }
         }
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatsScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatsScreen.kt
index a5c1549e..41d49fa5 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ChatsScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ChatsScreen.kt
@@ -177,16 +177,20 @@ private fun TopAppBar(
         title = {
             Text(
                 text = stringResource(R.string.chats),
-                color = LocalCustomColors.current.light,
                 fontWeight = FontWeight.Bold
             )
         },
+        colors = TopAppBarDefaults.topAppBarColors(
+            containerColor = LocalCustomColors.current.primary,
+            navigationIconContentColor = LocalCustomColors.current.onPrimary,
+            titleContentColor = LocalCustomColors.current.onPrimary,
+            actionIconContentColor = LocalCustomColors.current.onPrimary
+        ),
         navigationIcon = {
             IconButton(onClick = { navController.popBackStack() }) {
                 Icon(
                     imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                     contentDescription = null,
-                    tint = LocalCustomColors.current.light
                 )
             }
         },
@@ -198,7 +202,6 @@ private fun TopAppBar(
                 Icon(
                     imageVector = Icons.Filled.Menu,
                     contentDescription = "Menu",
-                    tint = LocalCustomColors.current.light
                 )
             }
             DropdownMenu (
@@ -221,9 +224,6 @@ private fun TopAppBar(
                 }
             )
         },
-        colors = TopAppBarDefaults.topAppBarColors(
-            containerColor = LocalCustomColors.current.primary
-        )
     )
 }
 
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactsScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactsScreen.kt
index be35618a..17f3c03a 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ContactsScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ContactsScreen.kt
@@ -92,19 +92,19 @@ private fun ContactsScreen(navController: NavController, viewModel: ViewModel) {
                     title = {
                         Text(
                             text = stringResource(R.string.contacts),
-                            color = LocalCustomColors.current.light,
                             fontWeight = FontWeight.Bold
                         )
                     },
                     colors = TopAppBarDefaults.topAppBarColors(
-                        containerColor = LocalCustomColors.current.primary
+                        containerColor = LocalCustomColors.current.primary,
+                        navigationIconContentColor = LocalCustomColors.current.onPrimary,
+                        titleContentColor = LocalCustomColors.current.onPrimary
                     ),
                     navigationIcon = {
                         IconButton(onClick = { navController.popBackStack() }) {
                             Icon(
                                 imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                                 contentDescription = "Back",
-                                tint = LocalCustomColors.current.light
                             )
                         }
                     },
diff --git a/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt
index 6e472171..fe2febdf 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt
@@ -163,16 +163,20 @@ private fun SettingsScreen(
                     title = {
                         Text(
                             text = stringResource(R.string.configuration),
-                            color = LocalCustomColors.current.light,
                             fontWeight = FontWeight.Bold
                         )
                     },
+                    colors = TopAppBarDefaults.topAppBarColors(
+                        containerColor = LocalCustomColors.current.primary,
+                        navigationIconContentColor = LocalCustomColors.current.onPrimary,
+                        titleContentColor = LocalCustomColors.current.onPrimary,
+                        actionIconContentColor = LocalCustomColors.current.onPrimary
+                    ),
                     navigationIcon = {
                         IconButton(onClick = onBack) {
                             Icon(
                                 imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                                 contentDescription = null,
-                                tint = LocalCustomColors.current.light
                             )
                         }
                     },
@@ -181,14 +185,10 @@ private fun SettingsScreen(
                         IconButton(onClick = checkOnClick) {
                             Icon(
                                 imageVector = Icons.Filled.Check,
-                                tint = LocalCustomColors.current.light,
                                 contentDescription = "Check"
                             )
                         }
                     },
-                    colors = TopAppBarDefaults.topAppBarColors(
-                        containerColor = LocalCustomColors.current.primary
-                    )
                 )
             }
         }
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 044496ac..9c4ff73d 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -427,6 +427,9 @@
     <string name="tone_country_help">Soitto-, odotus- ja varattuäänien maa</string>
     <string name="dark_theme">Tumma teema</string>
     <string name="dark_theme_help">Käytä aina tummaa näyttöteemaa</string>
+    <string name="dynamic_colors">Dynaamiset värit</string>
+    <string name="dynamic_colors_help">Käytä dynaamisia värejä, jos ne on otettu käyttöön
+        Android-asetuksissa</string>
     <string name="colorblind">Värisokea</string>
     <string name="colorblind_help">Käytä värisokealle ystävällisiä rekisteröintitilaikoineita</string>
     <string name="proximity_sensing">Läheisyyden tunnistus</string>