diff --git a/app/src/main/java/org/linphone/ui/main/MainActivity.kt b/app/src/main/java/org/linphone/ui/main/MainActivity.kt
index f6d09cdc7..076140b6c 100644
--- a/app/src/main/java/org/linphone/ui/main/MainActivity.kt
+++ b/app/src/main/java/org/linphone/ui/main/MainActivity.kt
@@ -119,6 +119,7 @@ class MainActivity : GenericActivity() {
         }
     }
 
+    @SuppressLint("InlinedApi")
     override fun onCreate(savedInstanceState: Bundle?) {
         // Must be done before the setContentView
         installSplashScreen()
diff --git a/app/src/main/java/org/linphone/ui/main/history/fragment/StartCallFragment.kt b/app/src/main/java/org/linphone/ui/main/history/fragment/StartCallFragment.kt
index 7ed040be6..2df7e1188 100644
--- a/app/src/main/java/org/linphone/ui/main/history/fragment/StartCallFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/fragment/StartCallFragment.kt
@@ -19,6 +19,7 @@
  */
 package org.linphone.ui.main.history.fragment
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -66,6 +67,7 @@ class StartCallFragment : GenericAddressPickerFragment() {
         return binding.root
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         viewModel = ViewModelProvider(this)[StartCallViewModel::class.java]
 
diff --git a/app/src/main/java/org/linphone/ui/main/meetings/model/TimeZoneModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/model/TimeZoneModel.kt
index 3f558749b..a1e72c5ba 100644
--- a/app/src/main/java/org/linphone/ui/main/meetings/model/TimeZoneModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/meetings/model/TimeZoneModel.kt
@@ -19,6 +19,7 @@
  */
 package org.linphone.ui.main.meetings.model
 
+import java.util.Locale
 import java.util.TimeZone
 import java.util.concurrent.TimeUnit
 import kotlin.math.abs
@@ -34,9 +35,9 @@ class TimeZoneModel(timeZone: TimeZone) : Comparable<TimeZoneModel> {
     )
 
     private val gmt: String = if (hours >= 0) {
-        String.format("GMT+%02d:%02d - %s", hours, minutes, timeZone.id)
+        String.format(Locale.getDefault(), "GMT+%02d:%02d - %s", hours, minutes, timeZone.id)
     } else {
-        String.format("GMT%02d:%02d - %s", hours, minutes, timeZone.id)
+        String.format(Locale.getDefault(), "GMT%02d:%02d - %s", hours, minutes, timeZone.id)
     }
 
     override fun toString(): String {
diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt
index 9392963a2..4d114312a 100644
--- a/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt
@@ -292,8 +292,6 @@ class MainViewModel @UiThread constructor() : ViewModel() {
                 addAlert(NETWORK_NOT_REACHABLE, label)
             }
 
-            updatePostNotificationsPermission()
-
             if (core.callsNb > 0) {
                 updateCallAlert()
             }
@@ -304,6 +302,8 @@ class MainViewModel @UiThread constructor() : ViewModel() {
             }
         }
 
+        updatePostNotificationsPermission()
+
         if (VFS.isEnabled(coreContext.context)) {
             val cache = corePreferences.vfsCachePath
             viewModelScope.launch {
diff --git a/app/src/main/res/color/main2_100.xml b/app/src/main/res/color/main2_100.xml
deleted file mode 100644
index 4cbff3fd8..000000000
--- a/app/src/main/res/color/main2_100.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/color_main2_100"/>
-</selector>
diff --git a/app/src/main/res/drawable/atom.xml b/app/src/main/res/drawable/atom.xml
deleted file mode 100644
index e51c3ba36..000000000
--- a/app/src/main/res/drawable/atom.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="256"
-    android:viewportHeight="256">
-  <path
-      android:pathData="M196.12,128c24.65,-34.61 37.22,-70.38 19.74,-87.86S162.61,35.23 128,59.88C93.39,35.23 57.62,22.66 40.14,40.14S35.23,93.39 59.88,128c-24.65,34.61 -37.22,70.38 -19.74,87.86h0c5.63,5.63 13.15,8.14 21.91,8.14 18.48,0 42.48,-11.17 66,-27.88C151.47,212.83 175.47,224 194,224c8.76,0 16.29,-2.52 21.91,-8.14h0C233.34,198.38 220.77,162.61 196.12,128ZM204.55,51.45c7.64,7.64 2.48,32.4 -18.52,63.28a300.33,300.33 0,0 0,-21.19 -23.57A300.33,300.33 0,0 0,141.27 70C172.15,49 196.91,43.8 204.55,51.45ZM176.29,128a289.14,289.14 0,0 1,-22.76 25.53A289.14,289.14 0,0 1,128 176.29a289.14,289.14 0,0 1,-25.53 -22.76A289.14,289.14 0,0 1,79.71 128,298.62 298.62,0 0,1 128,79.71a289.14,289.14 0,0 1,25.53 22.76A289.14,289.14 0,0 1,176.29 128ZM51.45,51.45c2.2,-2.21 5.83,-3.35 10.62,-3.35C73.89,48.1 92.76,55 114.72,70A304,304 0,0 0,91.16 91.16,300.33 300.33,0 0,0 70,114.73C49,83.85 43.81,59.09 51.45,51.45ZM51.45,204.55C43.81,196.91 49,172.15 70,141.27a300.33,300.33 0,0 0,21.19 23.57A304.18,304.18 0,0 0,114.73 186C83.85,207 59.09,212.2 51.45,204.55ZM204.55,204.55c-7.64,7.65 -32.4,2.48 -63.28,-18.52a304.18,304.18 0,0 0,23.57 -21.19A300.33,300.33 0,0 0,186 141.27C207,172.15 212.19,196.91 204.55,204.55ZM140,128a12,12 0,1 1,-12 -12A12,12 0,0 1,140 128Z"
-      android:fillColor="#4e6074"/>
-</vector>
diff --git a/app/src/main/res/layout-land/dialog_zrtp_sas_validation.xml b/app/src/main/res/layout-land/dialog_zrtp_sas_validation.xml
index 17142a0b9..adf4afa48 100644
--- a/app/src/main/res/layout-land/dialog_zrtp_sas_validation.xml
+++ b/app/src/main/res/layout-land/dialog_zrtp_sas_validation.xml
@@ -34,6 +34,7 @@
                 android:layout_height="@dimen/icon_size"
                 android:layout_marginTop="10dp"
                 android:src="@drawable/trusted_white"
+                android:contentDescription="@null"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout-land/dialog_zrtp_security_alert.xml b/app/src/main/res/layout-land/dialog_zrtp_security_alert.xml
index 023f0397c..d8cece405 100644
--- a/app/src/main/res/layout-land/dialog_zrtp_security_alert.xml
+++ b/app/src/main/res/layout-land/dialog_zrtp_security_alert.xml
@@ -34,6 +34,7 @@
                 android:layout_height="@dimen/icon_size"
                 android:layout_marginTop="10dp"
                 android:src="@drawable/shield_warning"
+                android:contentDescription="@null"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml
index a7bb2b8af..edb45846b 100644
--- a/app/src/main/res/layout/chat_conversation_fragment.xml
+++ b/app/src/main/res/layout/chat_conversation_fragment.xml
@@ -224,6 +224,7 @@
                     android:layout_height="0dp"
                     android:padding="15dp"
                     android:src="@drawable/caret_up"
+                    android:contentDescription="@string/content_description_chat_search_message_up"
                     app:layout_constraintBottom_toBottomOf="@id/search"
                     app:layout_constraintEnd_toStartOf="@id/search_down"
                     app:layout_constraintTop_toTopOf="@id/search"
@@ -237,6 +238,7 @@
                     android:layout_height="0dp"
                     android:padding="15dp"
                     android:src="@drawable/caret_down"
+                    android:contentDescription="@string/content_description_chat_search_message_down"
                     app:layout_constraintBottom_toBottomOf="@id/search"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="@id/search"
diff --git a/app/src/main/res/layout/dialog_zrtp_sas_validation.xml b/app/src/main/res/layout/dialog_zrtp_sas_validation.xml
index d4efd85a9..cc0629c64 100644
--- a/app/src/main/res/layout/dialog_zrtp_sas_validation.xml
+++ b/app/src/main/res/layout/dialog_zrtp_sas_validation.xml
@@ -31,6 +31,7 @@
                 android:layout_height="@dimen/icon_size"
                 android:layout_marginTop="10dp"
                 android:src="@drawable/trusted_white"
+                android:contentDescription="@null"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/dialog_zrtp_security_alert.xml b/app/src/main/res/layout/dialog_zrtp_security_alert.xml
index 331ddd368..5fa3f1643 100644
--- a/app/src/main/res/layout/dialog_zrtp_security_alert.xml
+++ b/app/src/main/res/layout/dialog_zrtp_security_alert.xml
@@ -31,6 +31,7 @@
                 android:layout_height="@dimen/icon_size"
                 android:layout_marginTop="10dp"
                 android:src="@drawable/shield_warning"
+                android:contentDescription="@null"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/file_pdf_viewer_page.xml b/app/src/main/res/layout/file_pdf_viewer_page.xml
index 5c9a25d02..366d964ba 100644
--- a/app/src/main/res/layout/file_pdf_viewer_page.xml
+++ b/app/src/main/res/layout/file_pdf_viewer_page.xml
@@ -2,5 +2,4 @@
 <com.github.chrisbanes.photoview.PhotoView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/pdf_image"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"/>
\ No newline at end of file
+    android:layout_height="match_parent"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/file_viewer_activity.xml b/app/src/main/res/layout/file_viewer_activity.xml
index ce71df31c..3dc4541a1 100644
--- a/app/src/main/res/layout/file_viewer_activity.xml
+++ b/app/src/main/res/layout/file_viewer_activity.xml
@@ -39,6 +39,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="horizontal"
+            android:background="@color/white"
             android:visibility="@{viewModel.isPdf ? View.VISIBLE : View.GONE, default=gone}" />
 
         <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/settings_calls.xml b/app/src/main/res/layout/settings_calls.xml
index a6c4431d6..3f803b37e 100644
--- a/app/src/main/res/layout/settings_calls.xml
+++ b/app/src/main/res/layout/settings_calls.xml
@@ -146,7 +146,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/settings_title_style"
-            android:id="@+id/advanced_settings"
+            android:id="@+id/change_ringtone"
             android:onClick="@{() -> viewModel.changeRingtone()}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c02ab9fba..bebc6c43f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -117,21 +117,6 @@
     <string name="assistant_third_party_sip_account_warning_ok">J\'ai compris</string>
     <string name="assistant_third_party_sip_account_username_or_identity">Nom d\'utilisateur ou identité SIP*</string>
     <string name="assistant_account_register_unavailable_no_push_toast">Les notifications poussées ne sont pas disponibles, la création de compte est donc désactivée.</string>
-    <string name="assistant_account_register_username_already_in_use_error">Ce compte existe déjà</string>
-    <string name="assistant_account_register_username_invalid_characters_error">Caractère(s) invalide(s): les majuscules et les caractères spéciaux ne sont pas autorisés</string>
-    <string name="assistant_account_register_username_too_short_error">Le nom d\'utilisateur est trop court</string>
-    <string name="assistant_account_register_username_too_long_error">Le nom d\'utilisateur est trop long</string>
-    <string name="assistant_account_register_username_error">Erreur inattendue dans le nom d\'utilisateur</string>
-    <string name="assistant_account_register_phone_number_already_in_use_error">Numéro de téléphone déjà utilisé</string>
-    <string name="assistant_account_register_invalid_phone_number_international_prefix_error">Numéro de téléphone invalide</string>
-    <string name="assistant_account_register_invalid_phone_number_too_long_error">Le numéro de téléphone est trop long</string>
-    <string name="assistant_account_register_invalid_phone_number_too_short_error">Le numéro de téléphone est trop court</string>
-    <string name="assistant_account_register_invalid_phone_number_error">Erreur inattendue dans le numéro de téléphone</string>
-    <string name="assistant_account_register_password_invalid_characters_error">Caractère(s) invalide(s)</string>
-    <string name="assistant_account_register_password_too_short">Le mot de passe est trop court</string>
-    <string name="assistant_account_register_password_too_long_error">Le mot de passe est trop long</string>
-    <string name="assistant_account_register_invalid_password_error">Erreur inattendue dans le mot de passe</string>
-    <string name="assistant_account_register_server_error">Erreur %i pendant la création du compte</string>
     <string name="assistant_account_register_push_notification_not_received_error">La notification poussée avec le jeton d\'authentification n\'a pas été reçue dans les 5 secondes, merci de réessayer plus tard</string>
     <string name="assistant_account_register_unexpected_error">Un erreur inattendue est survenue, merci de réessayer plus tard</string>
     <string name="assistant_account_login_forbidden_error">Mauvais nom d\'utilisateur ou mot de passe</string>
@@ -586,7 +571,6 @@
     <string name="call_state_ended">Terminé</string>
     <string name="call_waiting_for_encryption_info">En attente du chiffrement…</string>
     <string name="call_zrtp_end_to_end_encrypted">Appel chiffré de bout en bout</string>
-    <string name="call_post_quantum_zrtp_end_to_end_encrypted">Appel chiffré de bout en bout en post-quantique</string>
     <string name="call_do_zrtp_sas_validation_again">Faire la vérification à nouveau</string>
     <string name="call_zrtp_sas_validation_required">Vérification nécessaire</string>
     <string name="call_srtp_point_to_point_encrypted">Appel chiffré de point à point</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1d9154ece..4bbc4bd34 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -154,21 +154,6 @@
     <string name="assistant_third_party_sip_account_warning_ok">I understand</string>
     <string name="assistant_third_party_sip_account_username_or_identity">Username or SIP identity*</string>
     <string name="assistant_account_register_unavailable_no_push_toast">Push notifications not available, account creation disabled</string>
-    <string name="assistant_account_register_username_already_in_use_error">This account already exists</string>
-    <string name="assistant_account_register_username_invalid_characters_error">Invalid characters: capital letters and special characters are not allowed</string>
-    <string name="assistant_account_register_username_too_short_error">Username is too short</string>
-    <string name="assistant_account_register_username_too_long_error">Username is too long</string>
-    <string name="assistant_account_register_username_error">Unexpected username error</string>
-    <string name="assistant_account_register_phone_number_already_in_use_error">Phone number already used</string>
-    <string name="assistant_account_register_invalid_phone_number_international_prefix_error">Invalid phone number</string>
-    <string name="assistant_account_register_invalid_phone_number_too_long_error">Phone number is too long</string>
-    <string name="assistant_account_register_invalid_phone_number_too_short_error">Phone number is too short</string>
-    <string name="assistant_account_register_invalid_phone_number_error">Unexpected phone number error</string>
-    <string name="assistant_account_register_password_invalid_characters_error">Invalid characters</string>
-    <string name="assistant_account_register_password_too_short">Password is too short</string>
-    <string name="assistant_account_register_password_too_long_error">Password is too long</string>
-    <string name="assistant_account_register_invalid_password_error">Unexpected password error</string>
-    <string name="assistant_account_register_server_error">Failed to create account, error %i</string>
     <string name="assistant_account_register_push_notification_not_received_error">Push notification with auth token not received in 5 seconds, please try again later</string>
     <string name="assistant_account_register_unexpected_error">Unexpected error occurred, please try again later</string>
     <string name="assistant_account_login_forbidden_error">Wrong username or password</string>
@@ -624,7 +609,6 @@
     <string name="call_state_ended">Ended</string>
     <string name="call_waiting_for_encryption_info">Waiting for encryption…</string>
     <string name="call_zrtp_end_to_end_encrypted">End-to-end encrypted by ZRTP</string>
-    <string name="call_post_quantum_zrtp_end_to_end_encrypted">End-to-end encrypted by post-quantum ZRTP</string>
     <string name="call_do_zrtp_sas_validation_again">Validate ZRTP SAS again</string>
     <string name="call_zrtp_sas_validation_required">Validation required</string>
     <string name="call_srtp_point_to_point_encrypted">Point-to-point encrypted by SRTP</string>
@@ -840,6 +824,8 @@
     <string name="content_description_chat_toggle_mute">Silences on/off this conversation</string>
     <string name="content_description_chat_removal_in_progress">Conversation is being removed</string>
     <string name="content_description_chat_unsecured">This conversation isn\'t secured</string>
+    <string name="content_description_chat_search_message_up">Search up</string>
+    <string name="content_description_chat_search_message_down">Search down</string>
     <string name="content_description_chat_create">Start a new conversation</string>
     <string name="content_description_meeting_today">Scroll to today</string>
     <string name="content_description_schedule_meeting">Schedule a meeting</string>