diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/ArrowRightCurved.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/ArrowRightCurved.kt
index 04d1e4b3a..5ee4e0d92 100644
--- a/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/ArrowRightCurved.kt
+++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/images/illus/ArrowRightCurved.kt
@@ -20,7 +20,6 @@ package com.infomaniak.swisstransfer.ui.images.illus
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/received/ReceivedScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/received/ReceivedScreen.kt
index 44d2819ba..15e182688 100644
--- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/received/ReceivedScreen.kt
+++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/received/ReceivedScreen.kt
@@ -34,19 +34,14 @@ import com.infomaniak.swisstransfer.ui.utils.PreviewTablet
 
 @Composable
 fun ReceivedScreen(navigateToDetails: (transferId: Int) -> Unit) {
-    ReceivedScreen()
-}
-
-@Composable
-private fun ReceivedScreen() {
     Scaffold(
         topBar = { BrandTobAppBar() },
         floatingActionButton = { ReceivedEmptyFab() },
     ) { contentPadding ->
         EmptyState(
             icon = AppIllus.MascotSearching,
-            title = R.string.no_transfer_received_title,
-            description = R.string.no_transfer_received_description,
+            title = R.string.noTransferReceivedTitle,
+            description = R.string.noTransferReceivedDescription,
             modifier = Modifier.padding(contentPadding),
         )
     }
@@ -57,7 +52,7 @@ private fun ReceivedScreen() {
 private fun ReceivedScreenMobilePreview() {
     SwissTransferTheme {
         Surface {
-            ReceivedScreen()
+            ReceivedScreen {}
         }
     }
 }
@@ -67,7 +62,7 @@ private fun ReceivedScreenMobilePreview() {
 private fun ReceivedScreenTabletPreview() {
     SwissTransferTheme {
         Surface {
-            ReceivedScreen()
+            ReceivedScreen {}
         }
     }
 }
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingItem.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingItem.kt
index 2cfc450f0..3ce00d6eb 100644
--- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingItem.kt
+++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/components/SettingItem.kt
@@ -35,9 +35,9 @@ import com.infomaniak.swisstransfer.R
 import com.infomaniak.swisstransfer.ui.components.SharpRippleButton
 import com.infomaniak.swisstransfer.ui.images.AppImages.AppIcons
 import com.infomaniak.swisstransfer.ui.images.icons.Add
+import com.infomaniak.swisstransfer.ui.images.icons.ArrowOpenOutside
 import com.infomaniak.swisstransfer.ui.images.icons.ChevronRightSmall
 import com.infomaniak.swisstransfer.ui.images.icons.Folder
-import com.infomaniak.swisstransfer.ui.images.icons.ArrowOpenOutside
 import com.infomaniak.swisstransfer.ui.theme.Dimens
 import com.infomaniak.swisstransfer.ui.theme.Margin
 import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 456539636..cc2ca5cb6 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -23,8 +23,8 @@
     <string name="contentDescriptionCreateNewTransferButton">Neuer Transfer</string>
     <string name="firstTransferDescription">Mache deine erste Überweisung!</string>
     <string name="importFilesScreenTitle">Zu übertragende Dateien</string>
-    <string name="no_transfer_received_description">Alle Überweisungen, die du in den letzten 30 Tagen erhältst, werden hier angezeigt.</string>
-    <string name="no_transfer_received_title">Keine Überweisungen erhalten</string>
+    <string name="noTransferReceivedDescription">Alle Überweisungen, die du in den letzten 30 Tagen erhältst, werden hier angezeigt.</string>
+    <string name="noTransferReceivedTitle">Keine Überweisungen erhalten</string>
     <string name="receivedTitle">Empfangen</string>
     <string name="sentEmptyTitle">Unsere Geschichte beginnt hier</string>
     <string name="sentTitle">Gesendet</string>
@@ -52,7 +52,7 @@
     <string name="settingsOptionValidityPeriod">Dauer der Gültigkeit</string>
     <string name="settingsThemeTitle">Wähle ein Thema aus</string>
     <string name="settingsTitle">Einstellungen</string>
-    <string name="settingsValidityPeriodTitle">Legen Sie eine Standardgültigkeitsdauer für Ihre Überweisungen fest</string>
+    <string name="settingsValidityPeriodTitle">Legt eine Standardgültigkeitsdauer für deine Transfers fest</string>
     <plurals name="settingsValidityPeriodValue">
         <item quantity="one">%d Tag</item>
         <item quantity="other">%d Tage</item>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7f00b7568..38a423d52 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -23,8 +23,8 @@
     <string name="contentDescriptionCreateNewTransferButton">Nueva transferencia</string>
     <string name="firstTransferDescription">Realice su primera transferencia</string>
     <string name="importFilesScreenTitle">Archivos para transferir</string>
-    <string name="no_transfer_received_description">Aquí aparecerán todas las transferencias recibidas en los últimos 30 días.</string>
-    <string name="no_transfer_received_title">No se han recibido transferencias</string>
+    <string name="noTransferReceivedDescription">Aquí aparecerán todas las transferencias recibidas en los últimos 30 días.</string>
+    <string name="noTransferReceivedTitle">No se han recibido transferencias</string>
     <string name="receivedTitle">Recibido</string>
     <string name="sentEmptyTitle">Nuestra historia comienza aquí</string>
     <string name="sentTitle">Enviado a</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f31ff4732..244d78a96 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -23,9 +23,9 @@
     <string name="contentDescriptionCreateNewTransferButton">Nouveau transfert</string>
     <string name="firstTransferDescription">Fais ton premier transfert !</string>
     <string name="importFilesScreenTitle">Fichiers à transférer</string>
-    <string name="no_transfer_received_description">Tous les transferts que tu recevras sur les 30 derniers jours apparaitront ici.</string>
-    <string name="no_transfer_received_title">Aucun transfert reçu</string>
-    <string name="receivedTitle">Recu</string>
+    <string name="noTransferReceivedDescription">Tous les transferts que tu recevras sur les 30 derniers jours apparaitront ici.</string>
+    <string name="noTransferReceivedTitle">Aucun transfert reçu</string>
+    <string name="receivedTitle">Reçu</string>
     <string name="sentEmptyTitle">Notre histoire commence ici</string>
     <string name="sentTitle">Envoyé</string>
     <string name="settingsCategoryAbout">A propos</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d455f5af3..0dc18cc4c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -19,12 +19,12 @@
     <string name="buttonAddFiles">Aggiunta di file</string>
     <string name="buttonNext">Avanti</string>
     <string name="contentDescriptionButtonBack">Indietro</string>
-    <string name="contentDescriptionButtonClose">Chiudere</string>
+    <string name="contentDescriptionButtonClose">Chiudi</string>
     <string name="contentDescriptionCreateNewTransferButton">Nuovo trasferimento</string>
-    <string name="firstTransferDescription">Effettuate il vostro primo trasferimento!</string>
+    <string name="firstTransferDescription">Effettua il tuo primo trasferimento!</string>
     <string name="importFilesScreenTitle">File da trasferire</string>
-    <string name="no_transfer_received_description">Qui appariranno tutti i bonifici ricevuti negli ultimi 30 giorni.</string>
-    <string name="no_transfer_received_title">Nessun trasferimento ricevuto</string>
+    <string name="noTransferReceivedDescription">Qui appariranno tutti i bonifici ricevuti negli ultimi 30 giorni.</string>
+    <string name="noTransferReceivedTitle">Nessun trasferimento ricevuto</string>
     <string name="receivedTitle">Ricevuto</string>
     <string name="sentEmptyTitle">La nostra storia inizia qui</string>
     <string name="sentTitle">Inviato a</string>
@@ -39,12 +39,12 @@
     <string name="settingsEmailLanguageValueItalian">Italiano</string>
     <string name="settingsEmailLanguageValueSpanish">Spagnolo</string>
     <string name="settingsNotificationsTitle">Seleziona una preferenza</string>
-    <string name="settingsOptionDiscoverInfomaniak">Scoprire Infomaniak</string>
+    <string name="settingsOptionDiscoverInfomaniak">Scopri Infomaniak</string>
     <string name="settingsOptionDownloadLimit">Limite di download</string>
     <string name="settingsOptionEmailLanguage">Lingua della posta elettronica</string>
-    <string name="settingsOptionGiveFeedback">Dite la vostra</string>
+    <string name="settingsOptionGiveFeedback">Di’ la tua</string>
     <string name="settingsOptionNotifications">Notifiche</string>
-    <string name="settingsOptionShareIdeas">Condividete le vostre idee</string>
+    <string name="settingsOptionShareIdeas">Condividi le tue idee</string>
     <string name="settingsOptionTheme">Tema</string>
     <string name="settingsOptionThemeDark">Scuro</string>
     <string name="settingsOptionThemeLight">Chiaro</string>
@@ -62,9 +62,9 @@
     <string name="transferTypeProximity">Vicino</string>
     <string name="transferTypeQrCode">Codice QR</string>
     <string name="transferTypeScreenTitle">Trasferimento</string>
-    <string name="transferTypeTitle">Invia i vostri file tramite</string>
+    <string name="transferTypeTitle">Invia i tuoi file tramite</string>
     <string name="transferUploadSourceChoiceCamera">Macchina fotografica</string>
-    <string name="transferUploadSourceChoiceFiles">Sfogliare i file</string>
+    <string name="transferUploadSourceChoiceFiles">Sfoglia i file</string>
     <string name="transferUploadSourceChoiceGallery">Galleria di foto e video</string>
     <string name="transferUploadSourceChoiceTitle">Scarica da</string>
     <string name="urlAbout">https://www.infomaniak.com/it/about</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5d40b6467..fcdc07b35 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,8 +26,8 @@
     <string name="contentDescriptionCreateNewTransferButton">New transfer</string>
     <string name="firstTransferDescription">Make your first transfer!</string>
     <string name="importFilesScreenTitle">Files to transfer</string>
-    <string name="no_transfer_received_description">All transfers you receive over the last 30 days will appear here.</string>
-    <string name="no_transfer_received_title">No transfers received</string>
+    <string name="noTransferReceivedDescription">All transfers you receive over the last 30 days will appear here.</string>
+    <string name="noTransferReceivedTitle">No transfers received</string>
     <string name="receivedTitle">Received</string>
     <string name="sentEmptyTitle">Our story begins here</string>
     <string name="sentTitle">Sent</string>