diff --git a/app/src/main/kotlin/com/tutpro/baresip/AndroidContactScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/AndroidContactScreen.kt
index 84f9e5b7..a516cf59 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AndroidContactScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AndroidContactScreen.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -26,7 +25,8 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Call
+import androidx.compose.material.icons.automirrored.filled.Chat
+import androidx.compose.material.icons.outlined.Call
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -40,11 +40,9 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
@@ -224,15 +222,15 @@ private fun Uris(
                     fontSize = 18.sp,
                     color = MaterialTheme.colorScheme.onBackground,
                 )
-                Image(
-                    painter = painterResource(R.drawable.message),
-                    colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onBackground),
+                Icon(
+                    imageVector = Icons.AutoMirrored.Filled.Chat,
                     contentDescription = "Send Message",
+                    tint = MaterialTheme.colorScheme.onBackground,
                     modifier = Modifier.padding(end = 24.dp).clickable {
                         val aor = viewModel.selectedAor.value
                         val ua = UserAgent.ofAor(aor)
                         if (ua == null)
-                            Log.w(TAG, "message clickable did not find AoR $aor")
+                            Log.w(TAG, "Message clickable did not find AoR $aor")
                         else {
                             val intent = Intent(ctx, MainActivity::class.java)
                             intent.putExtra("uap", ua.uap)
@@ -246,14 +244,14 @@ private fun Uris(
                     }
                 )
                 Icon(
-                    imageVector = Icons.Filled.Call,
+                    imageVector = Icons.Outlined.Call,
                     contentDescription = "Call",
                     tint = MaterialTheme.colorScheme.onBackground,
                     modifier = Modifier.clickable {
                         val aor = viewModel.selectedAor.value
                         val ua = UserAgent.ofAor(aor)
                         if (ua == null)
-                            Log.w(TAG, "message clickable did not find AoR $aor")
+                            Log.w(TAG, "Call clickable did not find AoR $aor")
                         else {
                             val intent = Intent(ctx, MainActivity::class.java)
                             intent.putExtra("uap", ua.uap)
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatScreen.kt
index e69ff992..6ca39698 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ChatScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ChatScreen.kt
@@ -35,7 +35,7 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.automirrored.filled.Send
-import androidx.compose.material.icons.filled.Call
+import androidx.compose.material.icons.outlined.Call
 import androidx.compose.material.icons.outlined.Clear
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
@@ -62,12 +62,10 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardCapitalization
@@ -257,11 +255,11 @@ private fun TopAppBar(
                         }
                     }
                     else
-                        Log.w(TAG, "onClickListener did not find UA for $aor")
+                        Log.w(TAG, "Call button onClick listener did not find UA for $aor")
                 }
             ) {
                 Icon(
-                    imageVector = Icons.Filled.Call,
+                    imageVector = Icons.Outlined.Call,
                     contentDescription = "Call",
                 )
             }
diff --git a/app/src/main/res/drawable/message.xml b/app/src/main/res/drawable/message.xml
deleted file mode 100644
index a8e114eb..00000000
--- a/app/src/main/res/drawable/message.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="?attr/colorControlNormal" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
-</vector>