diff --git a/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt b/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt
index d949f5369..a15fd5ed1 100644
--- a/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt
@@ -63,28 +63,12 @@ class DialerFragment : SecureFragment<DialerFragmentBinding>() {
             ViewModelProvider(this).get(SharedMainViewModel::class.java)
         } ?: throw Exception("Invalid Activity")
 
-        binding.setEraseClickListener {
-            viewModel.eraseLastChar()
-        }
-
-        binding.setEraseLongClickListener {
-            viewModel.eraseAll()
-        }
-
         binding.setNewContactClickListener {
             val deepLink = "linphone-android://contact/new/${viewModel.enteredUri.value}"
             Log.i("[Dialer] Creating contact, starting deep link: $deepLink")
             findNavController().navigate(Uri.parse(deepLink))
         }
 
-        binding.setStartCallClickListener {
-            viewModel.startCall()
-        }
-
-        binding.setAddCallClickListener {
-            viewModel.startCall()
-        }
-
         binding.setTransferCallClickListener {
             viewModel.transferCall()
             // Transfer has been consumed
diff --git a/app/src/main/res/layout-land/dialer_fragment.xml b/app/src/main/res/layout-land/dialer_fragment.xml
index f778b294a..f9c4f3538 100644
--- a/app/src/main/res/layout-land/dialer_fragment.xml
+++ b/app/src/main/res/layout-land/dialer_fragment.xml
@@ -1,27 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <data>
         <import type="android.view.View"/>
-        <variable
-            name="eraseClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="eraseLongClickListener"
-            type="android.view.View.OnLongClickListener"/>
         <variable
             name="newContactClickListener"
             type="android.view.View.OnClickListener"/>
-        <variable
-            name="startCallClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="addCallClickListener"
-            type="android.view.View.OnClickListener"/>
         <variable
             name="transferCallClickListener"
             type="android.view.View.OnClickListener"/>
@@ -43,8 +27,8 @@
 
             <ImageView
                 android:id="@+id/erase"
-                android:onClick="@{eraseClickListener}"
-                android:onLongClick="@{eraseLongClickListener}"
+                android:onClick="@{() -> viewModel.eraseLastChar()}"
+                android:onLongClick="@{() -> viewModel.eraseAll()}"
                 android:contentDescription="@string/content_description_dialer_erase"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
@@ -90,7 +74,7 @@
                 android:src="@drawable/contact_add" />
 
             <ImageView
-                android:onClick="@{startCallClickListener}"
+                android:onClick="@{() -> viewModel.startCall()}"
                 android:visibility="@{viewModel.atLeastOneCall ? View.GONE : View.VISIBLE}"
                 android:contentDescription="@string/content_description_start_call"
                 android:layout_width="match_parent"
@@ -101,7 +85,7 @@
                 android:src="@drawable/call_audio_start" />
 
             <ImageView
-                android:onClick="@{addCallClickListener}"
+                android:onClick="@{() -> viewModel.startCall()}"
                 android:visibility="@{viewModel.atLeastOneCall &amp;&amp; !viewModel.transferVisibility ? View.VISIBLE : View.GONE, default=gone}"
                 android:contentDescription="@string/content_description_add_call"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml b/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml
index f04c72ffd..1cf595a29 100644
--- a/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml
+++ b/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml
@@ -1,27 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
         <import type="android.view.View"/>
-        <variable
-            name="eraseClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="eraseLongClickListener"
-            type="android.view.View.OnLongClickListener"/>
         <variable
             name="newContactClickListener"
             type="android.view.View.OnClickListener"/>
-        <variable
-            name="startCallClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="addCallClickListener"
-            type="android.view.View.OnClickListener"/>
         <variable
             name="transferCallClickListener"
             type="android.view.View.OnClickListener"/>
@@ -81,8 +66,8 @@
 
                 <ImageView
                     android:id="@+id/erase"
-                    android:onClick="@{eraseClickListener}"
-                    android:onLongClick="@{eraseLongClickListener}"
+                    android:onClick="@{() -> viewModel.eraseLastChar()}"
+                    android:onLongClick="@{() -> viewModel.eraseAll()}"
                     android:contentDescription="@string/content_description_dialer_erase"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
@@ -128,7 +113,7 @@
                     android:src="@drawable/contact_add" />
 
                 <ImageView
-                    android:onClick="@{startCallClickListener}"
+                    android:onClick="@{() -> viewModel.startCall()}"
                     android:visibility="@{viewModel.atLeastOneCall ? View.GONE : View.VISIBLE}"
                     android:contentDescription="@string/content_description_start_call"
                     android:layout_width="match_parent"
@@ -139,7 +124,7 @@
                     android:src="@drawable/call_audio_start" />
 
                 <ImageView
-                    android:onClick="@{addCallClickListener}"
+                    android:onClick="@{() -> viewModel.startCall()}"
                     android:visibility="@{viewModel.atLeastOneCall &amp;&amp; !viewModel.transferVisibility ? View.VISIBLE : View.GONE, default=gone}"
                     android:contentDescription="@string/content_description_add_call"
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-sw533dp/dialer_fragment.xml b/app/src/main/res/layout-sw533dp/dialer_fragment.xml
index 3bb72cec4..5b56fe573 100644
--- a/app/src/main/res/layout-sw533dp/dialer_fragment.xml
+++ b/app/src/main/res/layout-sw533dp/dialer_fragment.xml
@@ -1,25 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
         <import type="android.view.View"/>
-        <variable
-            name="eraseClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="eraseLongClickListener"
-            type="android.view.View.OnLongClickListener"/>
         <variable
             name="newContactClickListener"
             type="android.view.View.OnClickListener"/>
-        <variable
-            name="startCallClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="addCallClickListener"
-            type="android.view.View.OnClickListener"/>
         <variable
             name="transferCallClickListener"
             type="android.view.View.OnClickListener"/>
@@ -79,8 +66,8 @@
 
                 <ImageView
                     android:id="@+id/erase"
-                    android:onClick="@{eraseClickListener}"
-                    android:onLongClick="@{eraseLongClickListener}"
+                    android:onClick="@{() -> viewModel.eraseLastChar()}"
+                    android:onLongClick="@{() -> viewModel.eraseAll()}"
                     android:contentDescription="@string/content_description_dialer_erase"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
@@ -126,7 +113,7 @@
                     android:src="@drawable/contact_add" />
 
                 <ImageView
-                    android:onClick="@{startCallClickListener}"
+                    android:onClick="@{() -> viewModel.startCall()}"
                     android:visibility="@{viewModel.atLeastOneCall ? View.GONE : View.VISIBLE}"
                     android:contentDescription="@string/content_description_start_call"
                     android:layout_width="match_parent"
@@ -137,7 +124,7 @@
                     android:src="@drawable/call_audio_start" />
 
                 <ImageView
-                    android:onClick="@{addCallClickListener}"
+                    android:onClick="@{() -> viewModel.startCall()}"
                     android:visibility="@{viewModel.atLeastOneCall &amp;&amp; !viewModel.transferVisibility ? View.VISIBLE : View.GONE, default=gone}"
                     android:contentDescription="@string/content_description_add_call"
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialer_fragment.xml b/app/src/main/res/layout/dialer_fragment.xml
index 432efa33f..380102031 100644
--- a/app/src/main/res/layout/dialer_fragment.xml
+++ b/app/src/main/res/layout/dialer_fragment.xml
@@ -5,21 +5,9 @@
 
     <data>
         <import type="android.view.View"/>
-        <variable
-            name="eraseClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="eraseLongClickListener"
-            type="android.view.View.OnLongClickListener"/>
         <variable
             name="newContactClickListener"
             type="android.view.View.OnClickListener"/>
-        <variable
-            name="startCallClickListener"
-            type="android.view.View.OnClickListener"/>
-        <variable
-            name="addCallClickListener"
-            type="android.view.View.OnClickListener"/>
         <variable
             name="transferCallClickListener"
             type="android.view.View.OnClickListener"/>
@@ -41,8 +29,8 @@
 
             <ImageView
                 android:id="@+id/erase"
-                android:onClick="@{eraseClickListener}"
-                android:onLongClick="@{eraseLongClickListener}"
+                android:onClick="@{() -> viewModel.eraseLastChar()}"
+                android:onLongClick="@{() -> viewModel.eraseAll()}"
                 android:contentDescription="@string/content_description_dialer_erase"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
@@ -88,7 +76,7 @@
                 android:src="@drawable/contact_add" />
 
             <ImageView
-                android:onClick="@{startCallClickListener}"
+                android:onClick="@{() -> viewModel.startCall()}"
                 android:visibility="@{viewModel.atLeastOneCall ? View.GONE : View.VISIBLE}"
                 android:contentDescription="@string/content_description_start_call"
                 android:layout_width="match_parent"
@@ -99,7 +87,7 @@
                 android:src="@{viewModel.autoInitiateVideoCalls ? @drawable/call_video_start : @drawable/call_audio_start, default=@drawable/call_audio_start}" />
 
             <ImageView
-                android:onClick="@{addCallClickListener}"
+                android:onClick="@{() -> viewModel.startCall()}"
                 android:visibility="@{viewModel.atLeastOneCall &amp;&amp; !viewModel.transferVisibility ? View.VISIBLE : View.GONE, default=gone}"
                 android:contentDescription="@string/content_description_add_call"
                 android:layout_width="match_parent"