diff --git a/app/src/main/java/org/linphone/ui/voip/viewmodel/CurrentCallViewModel.kt b/app/src/main/java/org/linphone/ui/voip/viewmodel/CurrentCallViewModel.kt
index 4ded649a2..b20b21f19 100644
--- a/app/src/main/java/org/linphone/ui/voip/viewmodel/CurrentCallViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/voip/viewmodel/CurrentCallViewModel.kt
@@ -35,7 +35,7 @@ import org.linphone.utils.LinphoneUtils
 
 class CurrentCallViewModel() : ViewModel() {
     companion object {
-        const val TAG = "[Call ViewModel]"
+        const val TAG = "[Current Call ViewModel]"
     }
 
     val contact = MutableLiveData<ContactAvatarModel>()
diff --git a/app/src/main/res/drawable/shape_toast_blue_shadow.xml b/app/src/main/res/drawable/shape_toast_blue_shadow.xml
index 3033c4346..7a286b6c4 100644
--- a/app/src/main/res/drawable/shape_toast_blue_shadow.xml
+++ b/app/src/main/res/drawable/shape_toast_blue_shadow.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="50dp" />
-    <solid android:color="@color/trusted_blue"/>
-</shape>
\ No newline at end of file
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="50dp" />
+            <solid android:color="@color/trusted_blue"/>
+        </shape>
+    </item>
+    <item android:bottom="2dp">
+        <shape android:shape="rectangle">
+            <corners android:radius="50dp" />
+            <solid
+                android:color="@color/white" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_toast_green_shadow.xml b/app/src/main/res/drawable/shape_toast_green_shadow.xml
index 29b2f4106..7fd80a5e1 100644
--- a/app/src/main/res/drawable/shape_toast_green_shadow.xml
+++ b/app/src/main/res/drawable/shape_toast_green_shadow.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="50dp" />
-    <solid android:color="@color/green_online"/>
-</shape>
\ No newline at end of file
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="50dp" />
+            <solid android:color="@color/green_online"/>
+        </shape>
+    </item>
+    <item android:bottom="2dp">
+        <shape android:shape="rectangle">
+            <corners android:radius="50dp" />
+            <solid
+                android:color="@color/white" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/toast_blue.xml b/app/src/main/res/layout/toast_blue.xml
index 6c9a8b501..716eb527f 100644
--- a/app/src/main/res/layout/toast_blue.xml
+++ b/app/src/main/res/layout/toast_blue.xml
@@ -20,24 +20,11 @@
         android:layout_marginStart="17dp"
         android:layout_marginEnd="17dp">
 
-        <ImageView
-            android:id="@+id/toast_background_shadow"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:src="@drawable/shape_toast_blue_shadow"
-            app:layout_constraintBottom_toBottomOf="@id/message"
-            app:layout_constraintEnd_toEndOf="@id/toast_background"
-            app:layout_constraintStart_toStartOf="@id/toast_background"
-            app:layout_constraintTop_toTopOf="@id/toast_background" />
-
         <ImageView
             android:id="@+id/toast_background"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
-            android:layout_marginBottom="2dp"
-            android:src="@drawable/shape_dialog_background"
+            android:src="@drawable/shape_toast_blue_shadow"
             app:layout_constraintBottom_toBottomOf="@id/message"
             app:layout_constraintEnd_toEndOf="@id/message"
             app:layout_constraintStart_toStartOf="@id/icon"
diff --git a/app/src/main/res/layout/toast_green.xml b/app/src/main/res/layout/toast_green.xml
index fb8694e63..7610f7f4d 100644
--- a/app/src/main/res/layout/toast_green.xml
+++ b/app/src/main/res/layout/toast_green.xml
@@ -20,24 +20,11 @@
         android:layout_marginStart="17dp"
         android:layout_marginEnd="17dp">
 
-        <ImageView
-            android:id="@+id/toast_background_shadow"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:src="@drawable/shape_toast_green_shadow"
-            app:layout_constraintBottom_toBottomOf="@id/message"
-            app:layout_constraintEnd_toEndOf="@id/toast_background"
-            app:layout_constraintStart_toStartOf="@id/toast_background"
-            app:layout_constraintTop_toTopOf="@id/toast_background" />
-
         <ImageView
             android:id="@+id/toast_background"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
-            android:layout_marginBottom="2dp"
-            android:src="@drawable/shape_dialog_background"
+            android:src="@drawable/shape_toast_green_shadow"
             app:layout_constraintBottom_toBottomOf="@id/message"
             app:layout_constraintEnd_toEndOf="@id/message"
             app:layout_constraintStart_toStartOf="@id/icon"