diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt
index abfe58c5..faf9f1ae 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt
@@ -20,7 +20,7 @@ class ChatsActivity: AppCompatActivity() {
     internal lateinit var listView: ListView
     private lateinit var clAdapter: ChatListAdapter
     internal lateinit var peerUri: AutoCompleteTextView
-    internal lateinit var plusButton: ImageButton
+    private lateinit var plusButton: ImageButton
     internal lateinit var aor: String
     private var scrollPosition = -1
 
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
index 5d6bf8ab..0c1f0c0e 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
@@ -444,7 +444,7 @@ class ConfigActivity : AppCompatActivity() {
 
     }
 
-    fun bindTitles() {
+    private fun bindTitles() {
         binding.AutoStartTitle.setOnClickListener {
             Utils.alertView(this, getString(R.string.start_automatically),
                     getString(R.string.start_automatically_help))
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index d06aff4c..dca7675c 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -1378,8 +1378,7 @@ class MainActivity : AppCompatActivity() {
         val input = layout.findViewById(R.id.password) as EditText
         input.requestFocus()
         val context = this
-        val builder = AlertDialog.Builder(this, R.style.AlertDialog)
-        with(builder) {
+        with (AlertDialog.Builder(this, R.style.AlertDialog)) {
             setView(layout)
             setPositiveButton(android.R.string.ok) { dialog, _ ->
                 imm.hideSoftInputFromWindow(input.windowToken, 0)
@@ -1403,7 +1402,7 @@ class MainActivity : AppCompatActivity() {
                 imm.hideSoftInputFromWindow(input.windowToken, 0)
                 dialog.cancel()
             }
-            val dialog = builder.create()
+            val dialog = this.create()
             dialog.window!!.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
             dialog.show()
         }
@@ -1427,8 +1426,7 @@ class MainActivity : AppCompatActivity() {
                 val input = layout.findViewById(R.id.password) as EditText
                 input.requestFocus()
                 val context = this
-                val builder = AlertDialog.Builder(this, R.style.AlertDialog)
-                with(builder) {
+                with (AlertDialog.Builder(this, R.style.AlertDialog)) {
                     setView(layout)
                     setPositiveButton(android.R.string.ok) { dialog, _ ->
                         imm.hideSoftInputFromWindow(input.windowToken, 0)
@@ -1448,7 +1446,7 @@ class MainActivity : AppCompatActivity() {
                         aorPasswords[aor] = ""
                         askPasswords(accounts)
                     }
-                    val dialog = builder.create()
+                    val dialog = this.create()
                     dialog.window!!.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
                     dialog.show()
                 }
diff --git a/app/src/main/res/layout/call_row.xml b/app/src/main/res/layout/call_row.xml
index 50ec7301..19d97390 100644
--- a/app/src/main/res/layout/call_row.xml
+++ b/app/src/main/res/layout/call_row.xml
@@ -31,6 +31,7 @@
 
         <ImageView
             android:id="@+id/CardImageAvatar"
+            android:contentDescription="@string/avatar_image"
             android:layout_height="36dp"
             android:layout_width="36dp"
             android:adjustViewBounds="true"
diff --git a/app/src/main/res/layout/chat_row.xml b/app/src/main/res/layout/chat_row.xml
index 92bab5d1..67222cbd 100644
--- a/app/src/main/res/layout/chat_row.xml
+++ b/app/src/main/res/layout/chat_row.xml
@@ -29,6 +29,7 @@
 
         <ImageView
             android:id="@+id/ImageAvatar"
+            android:contentDescription="@string/avatar_image"
             android:layout_height="36dp"
             android:layout_width="36dp"
             android:adjustViewBounds="true"