diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75c5f9f68..5d423eb05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,12 @@ Group changes to describe their impact on the project, as follows:
     Fixed for any bug fixes.
     Security to invite users to upgrade in case of vulnerabilities.
 
+## [5.0.10] - 2023-01-04
+
+### Fixed
+- Plain copy of encrypted files (when VFS is enabled) not cleaned
+- Avatar display issue if contact's "initials" contains more than 1 emoji or an emoji + a character
+
 ## [5.0.9] - 2023-03-30
 
 ### Fixed
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index e21e24d51..c5aea912c 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -343,7 +343,7 @@ class CoreContext(
 
         if (corePreferences.vfsEnabled) {
             val notClearedCount = FileUtils.countFilesInDirectory(corePreferences.vfsCachePath)
-            if (notClearedCount != 0) {
+            if (notClearedCount > 0) {
                 Log.w("[Context] [VFS] There are [$notClearedCount] plain files not cleared from previous app lifetime, removing them now")
             }
             FileUtils.clearExistingPlainFiles()
@@ -868,7 +868,7 @@ class CoreContext(
             return
         }
         if (corePreferences.vfsEnabled) {
-            Log.w("[Context] Do not make received file(s) public when VFS is enabled")
+            Log.w("[Context] [VFS] Do not make received file(s) public when VFS is enabled")
             return
         }
         if (!corePreferences.makePublicMediaFilesDownloaded) {
@@ -890,7 +890,7 @@ class CoreContext(
 
     fun addContentToMediaStore(content: Content) {
         if (corePreferences.vfsEnabled) {
-            Log.w("[Context] Do not make received file(s) public when VFS is enabled")
+            Log.w("[Context] [VFS] Do not make received file(s) public when VFS is enabled")
             return
         }
         if (!corePreferences.makePublicMediaFilesDownloaded) {
@@ -1082,10 +1082,10 @@ class CoreContext(
 
         fun activateVFS() {
             try {
-                Log.i("[Context] Activating VFS")
+                Log.i("[Context] [VFS] Activating VFS")
                 val preferences = corePreferences.encryptedSharedPreferences
                 if (preferences == null) {
-                    Log.e("[Context] Can't get encrypted SharedPreferences, can't init VFS")
+                    Log.e("[Context] [VFS] Can't get encrypted SharedPreferences, can't init VFS")
                     return
                 }
 
@@ -1105,9 +1105,9 @@ class CoreContext(
                     32
                 )
 
-                Log.i("[Context] VFS activated")
+                Log.i("[Context] [VFS] VFS activated")
             } catch (e: Exception) {
-                Log.f("[Context] Unable to activate VFS encryption: $e")
+                Log.f("[Context] [VFS] Unable to activate VFS encryption: $e")
             }
         }
     }
diff --git a/app/src/main/java/org/linphone/utils/AppUtils.kt b/app/src/main/java/org/linphone/utils/AppUtils.kt
index 8ba84545c..81a538dfa 100644
--- a/app/src/main/java/org/linphone/utils/AppUtils.kt
+++ b/app/src/main/java/org/linphone/utils/AppUtils.kt
@@ -79,7 +79,12 @@ class AppUtils {
                 if (split[i].isNotEmpty()) {
                     try {
                         if (emoji?.hasEmojiGlyph(split[i]) == true) {
-                            initials += emoji.process(split[i])
+                            val glyph = emoji.process(split[i])
+                            if (characters > 0) { // Limit initial to 1 emoji only
+                                initials = ""
+                            }
+                            initials += glyph
+                            break // Limit initial to 1 emoji only
                         } else {
                             initials += split[i][0]
                         }