diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e2d95f71..63f8ead4 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -17,8 +17,8 @@ android {
 
     defaultConfig {
         applicationId = "com.twofasapp"
-        versionName = "5.0.2"
-        versionCode = 5000005
+        versionName = "5.0.3"
+        versionCode = 5000007
 
         val versionCodeOffset = 5000000
 
diff --git a/core/designsystem/src/main/java/com/twofasapp/designsystem/dialog/Dialog.kt b/core/designsystem/src/main/java/com/twofasapp/designsystem/dialog/Dialog.kt
index 72747902..9422942f 100644
--- a/core/designsystem/src/main/java/com/twofasapp/designsystem/dialog/Dialog.kt
+++ b/core/designsystem/src/main/java/com/twofasapp/designsystem/dialog/Dialog.kt
@@ -2,13 +2,18 @@ package com.twofasapp.designsystem.dialog
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.sizeIn
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -67,6 +72,7 @@ fun BaseDialog(
         ) {
             Column(
                 modifier = Modifier
+                    .height(IntrinsicSize.Min)
                     .sizeIn(minWidth = MinWidth, maxWidth = MaxWidth)
                     .padding(
                         top = DialogPadding,
@@ -130,7 +136,7 @@ private fun Title(
 }
 
 @Composable
-private fun Body(
+private fun ColumnScope.Body(
     text: String?,
     textAnnotated: AnnotatedString?,
 ) {
@@ -142,6 +148,8 @@ private fun Body(
             modifier = Modifier
                 .padding(horizontal = DialogPadding)
                 .padding(TitlePadding)
+                .verticalScroll(rememberScrollState())
+
         )
     } else if (textAnnotated != null) {
         Text(
diff --git a/core/locale/src/main/java/com/twofasapp/locale/Strings.kt b/core/locale/src/main/java/com/twofasapp/locale/Strings.kt
index 7cf4aa58..ed5c01a5 100644
--- a/core/locale/src/main/java/com/twofasapp/locale/Strings.kt
+++ b/core/locale/src/main/java/com/twofasapp/locale/Strings.kt
@@ -334,6 +334,7 @@ class Strings(c: Context) {
     val backupImportErrorMsg = c.getString(R.string.backup__import_error_file_invalid)
     val backupImportErrorMsgSize = c.getString(R.string.backup__import_error_file_size)
     val backupImportErrorDecryptError = c.getString(R.string.backup_error_decrypt_unknown)
+    val backupImportErrorInvalidSchema = c.getString(R.string.backup__import_invalid_version)
     val backupImportSuccess = c.getString(R.string.import_ga_success)
 
     val backupTurnOffTitle = c.getString(R.string.backup_turn_off_title)
diff --git a/core/locale/src/main/res/values-de-rDE/strings.xml b/core/locale/src/main/res/values-de-rDE/strings.xml
index 77e799d9..34ccf386 100644
--- a/core/locale/src/main/res/values-de-rDE/strings.xml
+++ b/core/locale/src/main/res/values-de-rDE/strings.xml
@@ -5,7 +5,7 @@
  Release: Working copy
  Locale: de-DE, German (Germany)
  Exported by: rafakob
- Exported at: Fri, 27 Oct 2023 12:02:50 -0700
+ Exported at: Sat, 11 Nov 2023 08:12:03 -0800
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings
@@ -85,7 +85,7 @@
     <string name="introduction__page_4_content_ios">Deine Tokens werden offline über den Gerätespeicher geladen, denke also daran, deine Dienste zu sichern! Verwende iCloud Sync und ein PIN-Passwort, um dich vor unberechtigtem Zugriff und Geräteschäden zu schützen.</string>
     <!-- introduction__start_using -->
     <string name="introduction__title">Verwendung von 2FAS beginnen</string>
-    <string name="introduction__tos">Bedingungen für den Service</string>
+    <string name="introduction__tos">Allgemeine Geschäftsbedingungen</string>
     <string name="introduction__description_title">Kopple dein Online-Service-Konto mit 2FAS oder importiere deine Tokens</string>
     <string name="introduction__pair_new_service">Neuen Dienst koppeln</string>
     <!-- introduction__import_2fas -->
@@ -119,11 +119,11 @@
     <!-- security__confirm_your_new_pin -->
     <string name="security__confirm_new_pin">Bitte bestätige deine neue PIN</string>
     <string name="security__create_pin">PIN erstellen</string>
-    <string name="security__enter_current_pin">Bitte gebe deine aktuelle PIN ein</string>
+    <string name="security__enter_current_pin">Bitte gib deine aktuelle PIN ein</string>
     <!-- security__enter_your_new_pin -->
-    <string name="security__enter_new_pin">Bitte gebe deine neue PIN ein</string>
+    <string name="security__enter_new_pin">Bitte gib deine neue PIN ein</string>
     <!-- security__enter_your_pin -->
-    <string name="security__enter_pin">Bitte gebe deine PIN ein</string>
+    <string name="security__enter_pin">Bitte gib deine PIN ein</string>
     <!-- MARK: - Security -->
     <string name="security__too_many_attempts_try_again_after_formatter">Zu viele Versuche. Bitte versuche es erneut %s</string>
     <string name="security__too_many_attempts_try_again_after">Zu viele Versuche. Bitte versuche es nach %s Minuten erneut.</string>
@@ -452,7 +452,7 @@
     <!-- browser__code_success -->
     <string name="browser__code_success_title">Token erfolgreich gesendet!</string>
     <string name="browser__code_failure">Fehler beim Senden des Codes. %s</string>
-    <string name="browser__deleting_paired_device_title">Gekoppelte Gerät löschen</string>
+    <string name="browser__deleting_paired_device_title">Gekoppeltes Gerät löschen</string>
     <string name="browser__deleting_paired_device_content">Möchtest du wirklich dieses gekoppelte Gerät löschen?</string>
     <string name="browser__pairing_date">Datum verbunden</string>
     <string name="browser__forget_this_browser">Diesen Webbrowser vergessen</string>
@@ -488,26 +488,26 @@
     <string name="gdrive_permission_msg">Wir benötigen die Google Drive-Berechtigung, um die Sicherungsdateien in den App-Daten zu speichern.</string>
     <string name="gdrive_internet_title">Internetverbindung benötigt</string>
     <string name="gdrive_internet_msg">Um mit Google Drive zu synchronisieren, musst du deine Internetverbindung aktivieren.</string>
-    <string name="gdrive_wipe_internet_msg">Um Zugriff auf Google Drive zu entfernen, musst du deine Internetverbindung aktivieren.</string>
+    <string name="gdrive_wipe_internet_msg">Um den Zugriff auf Google Drive zu entfernen, musst du deine Internetverbindung aktivieren.</string>
     <string name="backup_explanation_msg">Speichere und synchronisiere deine Sicherungsdatei automatisch in einem versteckten Ordner auf Google Drive. Dieser Ordner ist nur durch die 2FAS App zugänglich.</string>
     <string name="backup_error_unknown">Bei der Synchronisierung des Backups ist ein Fehler aufgetreten. Bitte starte die App nach ein paar Minuten neu und versuche es erneut.</string>
-    <string name="backup_error_encrypt_unknown">Bei der Verschlüsselung des Backups ist ein Fehler aufgetreten. Bitte gebe dein Passwort erneut ein.</string>
-    <string name="backup_error_decrypt_unknown">Bei der Entschlüsselung des Backups ist ein Fehler aufgetreten. Bitte gebe dein Passwort erneut ein.</string>
+    <string name="backup_error_encrypt_unknown">Bei der Verschlüsselung des Backups ist ein Fehler aufgetreten. Bitte gib dein Passwort erneut ein.</string>
+    <string name="backup_error_decrypt_unknown">Bei der Entschlüsselung des Backups ist ein Fehler aufgetreten. Bitte gib dein Passwort erneut ein.</string>
     <string name="backup__google_drive_problem_title">Es existiert ein Problem mit iCloud. Überprüfen die Systemeinstellungen</string>
     <string name="backup_error_auth">Es gab ein Problem mit den Berechtigungen deines Google Drive-Kontos. Versuche die Synchronisierung ein- und auszuschalten.</string>
-    <string name="backup_error_no_password">Dein Backup ist durch ein Passwort geschützt. Schalte es an und gebe dein Passwort ein.</string>
-    <string name="backup_error_wrong_password">Dein Backup ist durch ein Passwort geschützt aber ein falsches Passwort wurde verwendet. Schalte es wieder an und gebe dein Passwort ein.</string>
+    <string name="backup_error_no_password">Dein Backup ist passwortgeschützt. Schalte es ein und gib dein Passwort ein.</string>
+    <string name="backup_error_wrong_password">Dein Backup ist passwortgeschützt, aber das eingegebene Passwort ist falsch. Schalte es ein und gib dein Passwort ein.</string>
     <string name="customization_service_assignment">Dienstzuweisung</string>
     <string name="customization_personalization">Personalisierung</string>
     <string name="customization_change_brand">Marke ändern</string>
     <string name="customization_advanced">Erweitert</string>
     <string name="customization_request_icon">Icon beantragen</string>
     <string name="customization_edit_label">Kennzeichnung bearbeiten</string>
-    <string name="groups_delete_msg">Bist du dir sicher, das du diese Gruppe löschen möchtest?</string>
+    <string name="groups_delete_msg">Bist du dir sicher, dass du diese Gruppe löschen möchtest?</string>
     <string name="export_backup_title">Deine Sicherungsdatei ist zum Exportieren bereit</string>
     <string name="export_backup_msg">Exportiere diese Datei, um deine 2FAS-Tokens zu sichern. Du kannst die Datei später auf anderen Geräten mit der 2FAS Anwendung importieren.</string>
     <string name="export_backup_pass">Datei ohne Passwort exportieren\n(nicht empfohlen)</string>
-    <string name="import_backup_msg2">Die Datei wird mit der Dienstleiste der App synchronisiert.</string>
+    <string name="import_backup_msg2">Die Datei wird mit der Dienstliste der App synchronisiert.</string>
     <string name="backup_notice_later">Vielleicht später</string>
     <string name="backup_notice_cta">Einschalten</string>
     <string name="widgets_empty_msg">Keine Dienste hinzugefügt</string>
@@ -536,9 +536,9 @@
     <string name="commons__search">Suchen</string>
     <string name="errors__no_app">Keine Anwendung die diesen Link unterstützt</string>
     <string name="permissions__camera_permission">Kamera-Berechtigung</string>
-    <string name="permissions__camera_permission_description">Zum Scannen von QR-Codes ist eine Kamerazulassung erforderlich. Wenn du diese Funktion verwenden möchtest, gehe zu Anwendungsinformationen und Berechtigungen und aktiviere die Kamera.</string>
+    <string name="permissions__camera_permission_description">Zum Scannen von QR-Codes ist die Kamera-Berechtigung erforderlich. Wenn du diese Funktion verwenden möchtest, gehe zu Anwendungsinformationen und Berechtigungen und aktiviere die Kamera.</string>
     <string name="security__disable_pin">PIN deaktivieren</string>
-    <string name="security__enter_your_new_pin">Bitte gebe deine neue %s PIN ein</string>
+    <string name="security__enter_your_new_pin">Bitte gib deine neue %s PIN ein</string>
     <string name="security__pin_error_incorrect">Falsche PIN! Bitte versuche es erneut</string>
     <string name="settings__biometrics">Biometrie</string>
     <string name="settings__support">2FAS Support</string>
@@ -556,7 +556,7 @@
     <string name="tokens__qr_does_not_work">Dieser QR Code funktioniert nicht!</string>
     <!-- Could not read QR code from the image! -->
     <string name="tokens__qr_read_image_failed">Der QR-Code konnte nicht gelesen werden!</string>
-    <string name="tokens__qr_read_image_try_again">Versuche eine andere Sprache auszuwählen.</string>
+    <string name="tokens__qr_read_image_try_again">Versuche ein anderes Bild auszuwählen.</string>
     <string name="tokens__remove_it_forever">Dienst endgültig löschen</string>
     <!-- Service could not be added, Service Key is invalid. Try again. -->
     <string name="tokens__service_add_error">Dienst konnte nicht hinzugefügt werden, denn der Geheimschlüssel ist ungültig. Bitte versuche es nochmal.</string>
@@ -575,7 +575,7 @@
     <string name="update_app_title">App aktualisieren</string>
     <!-- Please update to the newest 2FAS version, to get all features and maintain high security level. -->
     <string name="update_app_msg">Bitte aktualisiere auf die neuste 2FAS Version, um alle Funktionen zu erhalten und die Aufrechterhaltung eines hohen Sicherheitsniveaus zu gewährleisten</string>
-    <string name="delete_service_title">Du löscht gerade</string>
+    <string name="delete_service_title">Du löschst gerade</string>
     <!-- from your 2FAS service list.\n\nRemember, as long as you have second factor authentication turned on, you will not log in to %s account without this token. -->
     <string name="delete_service_msg">aus deiner 2FAS-Dienstenliste.\n\nDenke daran, solange du Zwei-Faktor-Authentifizierung aktiviert hast, kannst du dich ohne diesen Token nicht in %s Konto anmelden.</string>
     <string name="delete_service_cta">Löschen</string>
@@ -639,13 +639,13 @@
     <string name="settings__send_logs_error_server">Es ist ein Fehler mit unseren Servern aufgetreten. Bitte melde dich bei unserem Support-Team, falls der Fehler weiterhin auftritt.</string>
     <string name="settings__send_logs_error_title">Vorgang fehlgeschlagen</string>
     <string name="settings__send_logs_sent_title">Protokolle gesendet</string>
-    <string name="settings__send_logs_sent_description">Danke für die Anfrage. Wir werden es uns anschauen, gebe uns ein wenig Zeit.</string>
+    <string name="settings__send_logs_sent_description">Danke für die Anfrage. Wir werden es uns anschauen, gib uns ein wenig Zeit.</string>
     <string name="commons__send">Senden</string>
     <string name="settings__send_logs_title">Protokolle werden gesendet</string>
     <string name="settings__send_logs_description_link">Der von dem Support-Team bereitgestellte Code wurde automatisch ausgefüllt. Protokolle senden?</string>
-    <string name="settings__send_logs_description_edit">Bitte gebe oder füge den von unserem Support-Team bereitgestellten Code ein</string>
+    <string name="settings__send_logs_description_edit">Bitte gib oder füge den von unserem Support-Team bereitgestellten Code ein</string>
     <string name="settings__send_logs">Protokolle senden</string>
-    <string name="settings__recommendation">Sehe dir diese großartige Zwei-Faktor-Authentifizierungs-App von 2FAS an: https://2fas.com</string>
+    <string name="settings__recommendation">Sieh dir diese großartige Zwei-Faktor-Authentifizierungs-App von 2FAS an: https://2fas.com</string>
     <string name="settings__acknowledgements">Danksagungen</string>
     <string name="introduction__import_external_app">Aus externer Anwendung Importieren</string>
     <plurals name="past_duration_seconds">
@@ -745,12 +745,12 @@
     <string name="tokens__add_title">Verbinde den Dienst mit 2FAS</string>
     <string name="tokens__add_description">Richte die Kamera auf den Bildschirm, um den QR-Code zu erfassen.</string>
     <string name="tokens__add_other_methods">Andere Methoden</string>
-    <string name="tokens__add_enter_manual">Gebe den Geheimschlüssel ein</string>
+    <string name="tokens__add_enter_manual">Gib den Geheimschlüssel manuell ein</string>
     <string name="tokens__add_from_gallery">Bild mit dem QR-Code hochladen</string>
     <string name="tokens__add_success_title">Fast fertig!</string>
     <string name="tokens__add_success_description">Um die Verbindung des Dienstes abzuschließen, musst du den Token erneut eingeben.</string>
     <string name="tokens__add_manual_title">Verbinde den Dienst mit 2FAS</string>
-    <string name="tokens__add_manual_description">Gebe den Dienst und den Geheimschlüssel ein.</string>
+    <string name="tokens__add_manual_description">Gib den Dienst und Geheimschlüssel ein.</string>
     <string name="tokens__add_manual_service_name">Dienstname</string>
     <string name="tokens__add_manual_service_key">Geheimschlüssel</string>
     <string name="tokens__add_manual_other">Andere Einstellungen</string>
@@ -802,7 +802,7 @@
     <string name="guides__guide_init_title">2FAS Hilfewerk</string>
     <string name="guides__guide_title">2FAS für %s\n</string>
     <string name="guides__guide_universal_title">Universelles 2FAS Hilfewerk\u0020</string>
-    <string name="browser__save_choice">Meine Wahl speichern\u0020</string>
+    <string name="browser__save_choice">Meine Wahl speichern</string>
     <string name="externalimport_andotp">andOTP</string>
     <string name="externalimport__andotp_title">2FA Tokens aus andOTP importieren</string>
     <string name="externalimport__andotp_success_msg">Diese JSON-Datei erlaubt es Tokens von andOTP zu importieren.</string>
@@ -811,4 +811,5 @@
     <string name="introduction__backup_description">Im nächsten Schritt wirst du gefragt auf welchem Google Account du deine Tokens sichern willst.\u0020</string>
     <string name="introduction__backup_take_risk_cta">Ich gehe das Risiko ein und erstelle kein Backup</string>
     <string name="introduction__backup_success">Die Google Drive Synchronisation wurde erfolgreich aktiviert.</string>
+    <string name="backup__import_invalid_version">The backup file you\'re attempting to import is not supported in this application version. The application only supports backup format versions up to %d, while the file you\'re importing is version %d.</string>
 </resources>
diff --git a/core/locale/src/main/res/values-es-rES/strings.xml b/core/locale/src/main/res/values-es-rES/strings.xml
index 3a5b903b..e9293d69 100644
--- a/core/locale/src/main/res/values-es-rES/strings.xml
+++ b/core/locale/src/main/res/values-es-rES/strings.xml
@@ -5,7 +5,7 @@
  Release: Working copy
  Locale: es-ES, Spanish (Spain)
  Exported by: rafakob
- Exported at: Fri, 27 Oct 2023 12:02:50 -0700
+ Exported at: Sat, 11 Nov 2023 08:12:03 -0800
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings
@@ -811,4 +811,5 @@
     <string name="introduction__backup_description">En el siguiente paso, tendrás que elegir tu cuenta de Google Drive, donde los tokens de 2FAS serán almacenados de forma segura.</string>
     <string name="introduction__backup_take_risk_cta">Acepto el riesgo, sin copia de seguridad</string>
     <string name="introduction__backup_success">¡Sincronización de Google Drive activada correctamente!</string>
+    <string name="backup__import_invalid_version">The backup file you\'re attempting to import is not supported in this application version. The application only supports backup format versions up to %d, while the file you\'re importing is version %d.</string>
 </resources>
diff --git a/core/locale/src/main/res/values-fr-rFR/strings.xml b/core/locale/src/main/res/values-fr-rFR/strings.xml
index 6aca26d5..6cfd6776 100644
--- a/core/locale/src/main/res/values-fr-rFR/strings.xml
+++ b/core/locale/src/main/res/values-fr-rFR/strings.xml
@@ -5,7 +5,7 @@
  Release: Working copy
  Locale: fr-FR, French (France)
  Exported by: rafakob
- Exported at: Fri, 27 Oct 2023 12:02:50 -0700
+ Exported at: Sat, 11 Nov 2023 08:12:03 -0800
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings
@@ -811,4 +811,5 @@
     <string name="introduction__backup_description">Lors de la prochaine étape, il vous sera demandé de choisir votre compte Google Drive, où vos jetons 2FA seront stockées sécuritairement.</string>
     <string name="introduction__backup_take_risk_cta">J\'accepte le risque, pas de sauvegarde</string>
     <string name="introduction__backup_success">Synchronisation avec Google Drive activée avec succès!</string>
+    <string name="backup__import_invalid_version">The backup file you\'re attempting to import is not supported in this application version. The application only supports backup format versions up to %d, while the file you\'re importing is version %d.</string>
 </resources>
diff --git a/core/locale/src/main/res/values-in/strings.xml b/core/locale/src/main/res/values-in/strings.xml
index c33ca33e..6c180bcd 100644
--- a/core/locale/src/main/res/values-in/strings.xml
+++ b/core/locale/src/main/res/values-in/strings.xml
@@ -5,7 +5,7 @@
  Release: Working copy
  Locale: id-ID, Indonesian (Indonesia)
  Exported by: rafakob
- Exported at: Fri, 27 Oct 2023 12:02:50 -0700
+ Exported at: Sat, 11 Nov 2023 08:12:03 -0800
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings
@@ -805,4 +805,5 @@
     <string name="introduction__backup_description">In the next step, you\'ll be asked to choose your Google Drive account, where the 2FA tokens will be stored safely.</string>
     <string name="introduction__backup_take_risk_cta">I\'ll take the risk, no backup</string>
     <string name="introduction__backup_success">Google Drive sync turned on successfully!</string>
+    <string name="backup__import_invalid_version">The backup file you\'re attempting to import is not supported in this application version. The application only supports backup format versions up to %d, while the file you\'re importing is version %d.</string>
 </resources>
diff --git a/core/locale/src/main/res/values-it-rIT/strings.xml b/core/locale/src/main/res/values-it-rIT/strings.xml
index e8aa975e..f8747a86 100644
--- a/core/locale/src/main/res/values-it-rIT/strings.xml
+++ b/core/locale/src/main/res/values-it-rIT/strings.xml
@@ -5,7 +5,7 @@
  Release: Working copy
  Locale: it-IT, Italian (Italy)
  Exported by: rafakob
- Exported at: Fri, 27 Oct 2023 12:02:50 -0700
+ Exported at: Sat, 11 Nov 2023 08:12:03 -0800
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings
@@ -811,4 +811,5 @@
     <string name="introduction__backup_description">Nel prossimo step, ti verrà richiesto di scegliere il tuo account Google Drive, dove i token 2FA verrano salvati in sicurezza</string>
     <string name="introduction__backup_take_risk_cta">Mi assumo il rischio, non eseguo il backup</string>
     <string name="introduction__backup_success">Sincronizzazione con Google Drive abilitata correttamente!</string>
+    <string name="backup__import_invalid_version">The backup file you\'re attempting to import is not supported in this application version. The application only supports backup format versions up to %d, while the file you\'re importing is version %d.</string>
 </resources>
diff --git a/core/locale/src/main/res/values-nl-rNL/strings.xml b/core/locale/src/main/res/values-nl-rNL/strings.xml
index 79ec90c0..18f28a0e 100644
--- a/core/locale/src/main/res/values-nl-rNL/strings.xml
+++ b/core/locale/src/main/res/values-nl-rNL/strings.xml
@@ -5,7 +5,7 @@
  Release: Working copy
  Locale: nl-NL, Dutch (Netherlands)
  Exported by: rafakob
- Exported at: Fri, 27 Oct 2023 12:02:50 -0700
+ Exported at: Sat, 11 Nov 2023 08:12:03 -0800
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings
@@ -811,4 +811,5 @@
     <string name="introduction__backup_description">In de volgende stap wordt u gevraagd om uw Google Drive-account, waar de 2FA-tokens veilig worden opgeslagen, te kiezen.</string>
     <string name="introduction__backup_take_risk_cta">Ik aanvaard het risico, geen back-up</string>
     <string name="introduction__backup_success">Google Drive-synchronisatie succesvol ingeschakeld!</string>
+    <string name="backup__import_invalid_version">The backup file you\'re attempting to import is not supported in this application version. The application only supports backup format versions up to %d, while the file you\'re importing is version %d.</string>
 </resources>
diff --git a/core/locale/src/main/res/values-pl-rPL/strings.xml b/core/locale/src/main/res/values-pl-rPL/strings.xml
index 33096728..90344f1c 100644
--- a/core/locale/src/main/res/values-pl-rPL/strings.xml
+++ b/core/locale/src/main/res/values-pl-rPL/strings.xml
@@ -5,7 +5,7 @@
  Release: Working copy
  Locale: pl-PL, Polish (Poland)
  Exported by: rafakob
- Exported at: Fri, 27 Oct 2023 12:02:50 -0700
+ Exported at: Sat, 11 Nov 2023 08:12:03 -0800
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings
@@ -817,4 +817,5 @@
     <string name="introduction__backup_description">W następnym kroku zostaniesz poproszony o wybranie konta Google Drive, na którym tokeny 2FA będą bezpiecznie przechowywane.</string>
     <string name="introduction__backup_take_risk_cta">Zaryzykuję, bez kopii zapasowej</string>
     <string name="introduction__backup_success">Synchronizacja z Dyskiem Google została pomyślnie włączona!</string>
+    <string name="backup__import_invalid_version">The backup file you\'re attempting to import is not supported in this application version. The application only supports backup format versions up to %d, while the file you\'re importing is version %d.</string>
 </resources>
diff --git a/core/locale/src/main/res/values-pt-rBR/strings.xml b/core/locale/src/main/res/values-pt-rBR/strings.xml
index c299fefd..f8de3441 100644
--- a/core/locale/src/main/res/values-pt-rBR/strings.xml
+++ b/core/locale/src/main/res/values-pt-rBR/strings.xml
@@ -5,7 +5,7 @@
  Release: Working copy
  Locale: pt-BR, Brazilian Portuguese
  Exported by: rafakob
- Exported at: Fri, 27 Oct 2023 12:02:50 -0700
+ Exported at: Sat, 11 Nov 2023 08:12:03 -0800
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings
@@ -811,4 +811,5 @@
     <string name="introduction__backup_description">Na próxima etapa, você será solicitado a escolher sua conta do Google Drive, onde os códigos 2FA serão armazenados com segurança.</string>
     <string name="introduction__backup_take_risk_cta">Vou correr o risco, sem backup</string>
     <string name="introduction__backup_success">Sincronização do Google Drive ativada com sucesso!</string>
+    <string name="backup__import_invalid_version">O arquivo que você tentou importar não é suportado nesta versão do aplicativo.\u0020\u0020A versão do esquema de backup atualmente suportada é 3 e o arquivo é 4.</string>
 </resources>
diff --git a/core/locale/src/main/res/values-pt-rPT/strings.xml b/core/locale/src/main/res/values-pt-rPT/strings.xml
index 1a8be1c7..cb472447 100644
--- a/core/locale/src/main/res/values-pt-rPT/strings.xml
+++ b/core/locale/src/main/res/values-pt-rPT/strings.xml
@@ -5,7 +5,7 @@
  Release: Working copy
  Locale: pt-PT, Portuguese (Portugal)
  Exported by: rafakob
- Exported at: Fri, 27 Oct 2023 12:02:50 -0700
+ Exported at: Sat, 11 Nov 2023 08:12:03 -0800
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings
@@ -811,4 +811,5 @@
     <string name="introduction__backup_description">In the next step, you\'ll be asked to choose your Google Drive account, where the 2FA tokens will be stored safely.</string>
     <string name="introduction__backup_take_risk_cta">I\'ll take the risk, no backup</string>
     <string name="introduction__backup_success">Google Drive sync turned on successfully!</string>
+    <string name="backup__import_invalid_version">The backup file you\'re attempting to import is not supported in this application version. The application only supports backup format versions up to %d, while the file you\'re importing is version %d.</string>
 </resources>
diff --git a/core/locale/src/main/res/values-uk-rUA/strings.xml b/core/locale/src/main/res/values-uk-rUA/strings.xml
index c7b38ef8..a0d6033a 100644
--- a/core/locale/src/main/res/values-uk-rUA/strings.xml
+++ b/core/locale/src/main/res/values-uk-rUA/strings.xml
@@ -5,7 +5,7 @@
  Release: Working copy
  Locale: uk-UA, Ukrainian (Ukraine)
  Exported by: rafakob
- Exported at: Fri, 27 Oct 2023 12:02:50 -0700
+ Exported at: Sat, 11 Nov 2023 08:12:03 -0800
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings
@@ -817,4 +817,5 @@
     <string name="introduction__backup_description">На наступному кроці вам буде запропоновано вибрати обліковий запис Google Drive, де безпечно зберігатимуться токени 2FA.</string>
     <string name="introduction__backup_take_risk_cta">Не хочу вмикати резервне копіювання</string>
     <string name="introduction__backup_success">Синхронізацію Google Drive ввімкнено успішно!</string>
+    <string name="backup__import_invalid_version">The backup file you\'re attempting to import is not supported in this application version. The application only supports backup format versions up to %d, while the file you\'re importing is version %d.</string>
 </resources>
diff --git a/core/locale/src/main/res/values/strings.xml b/core/locale/src/main/res/values/strings.xml
index e66e52f9..9f910b99 100644
--- a/core/locale/src/main/res/values/strings.xml
+++ b/core/locale/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
  Release: Working copy
  Locale: en, English
  Exported by: rafakob
- Exported at: Fri, 27 Oct 2023 12:02:50 -0700
+ Exported at: Sat, 11 Nov 2023 08:12:03 -0800
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- InfoPlist.strings
@@ -745,8 +745,8 @@
     <string name="tokens__add_title">Pair the service with 2FAS</string>
     <string name="tokens__add_description">Point your camera at the screen to capture the QR code.</string>
     <string name="tokens__add_other_methods">Other methods</string>
-    <string name="tokens__add_enter_manual">Enter secret key manually</string>
-    <string name="tokens__add_from_gallery">Upload screen with QR code</string>
+    <string name="tokens__add_enter_manual">Enter the secret key manually</string>
+    <string name="tokens__add_from_gallery">Upload screenshot with the QR code</string>
     <string name="tokens__add_success_title">Almost done!</string>
     <string name="tokens__add_success_description">To finish pairing the service, you need to retype this token.</string>
     <string name="tokens__add_manual_title">Pair the service with 2FAS</string>
@@ -811,4 +811,5 @@
     <string name="introduction__backup_description">In the next step, you\'ll be asked to choose your Google Drive account, where the 2FA tokens will be stored safely.</string>
     <string name="introduction__backup_take_risk_cta">I\'ll take the risk, no backup</string>
     <string name="introduction__backup_success">Google Drive sync turned on successfully!</string>
+    <string name="backup__import_invalid_version">The backup file you\'re attempting to import is not supported in this application version. The application only supports backup format versions up to %d, while the file you\'re importing is version %d.</string>
 </resources>
diff --git a/data/services/src/main/java/com/twofasapp/data/services/BackupRepositoryImpl.kt b/data/services/src/main/java/com/twofasapp/data/services/BackupRepositoryImpl.kt
index 78d29bcf..59c27e78 100644
--- a/data/services/src/main/java/com/twofasapp/data/services/BackupRepositoryImpl.kt
+++ b/data/services/src/main/java/com/twofasapp/data/services/BackupRepositoryImpl.kt
@@ -219,6 +219,12 @@ class BackupRepositoryImpl(
                     )
                 }
 
+            servicesToImport.forEach { service ->
+                // Check if it's valid in order not to break the local db
+                // Throw if one of the services is invalid
+                servicesRepository.checkServiceValid(service)
+            }
+
             servicesRepository.addServices(servicesToImport)
         }
     }
diff --git a/data/services/src/main/java/com/twofasapp/data/services/ServicesRepository.kt b/data/services/src/main/java/com/twofasapp/data/services/ServicesRepository.kt
index 55c5382c..a9904c48 100644
--- a/data/services/src/main/java/com/twofasapp/data/services/ServicesRepository.kt
+++ b/data/services/src/main/java/com/twofasapp/data/services/ServicesRepository.kt
@@ -28,6 +28,7 @@ interface ServicesRepository {
     suspend fun isServiceExists(secret: String): Boolean
     fun isSecretValid(secret: String): Boolean
     fun isServiceValid(link: OtpAuthLink): Boolean
+    fun checkServiceValid(service: Service)
     suspend fun addService(link: OtpAuthLink): Long
     suspend fun addService(service: Service, triggerSync: Boolean = true): Long
     suspend fun addServices(services: List<Service>)
diff --git a/data/services/src/main/java/com/twofasapp/data/services/ServicesRepositoryImpl.kt b/data/services/src/main/java/com/twofasapp/data/services/ServicesRepositoryImpl.kt
index 9d94df6f..258f80fb 100644
--- a/data/services/src/main/java/com/twofasapp/data/services/ServicesRepositoryImpl.kt
+++ b/data/services/src/main/java/com/twofasapp/data/services/ServicesRepositoryImpl.kt
@@ -2,6 +2,7 @@ package com.twofasapp.data.services
 
 import com.twofasapp.common.coroutines.Dispatchers
 import com.twofasapp.common.domain.BackupSyncStatus
+import com.twofasapp.common.domain.OtpAuthLink
 import com.twofasapp.common.domain.Service
 import com.twofasapp.common.domain.WidgetCallbacks
 import com.twofasapp.common.ktx.tickerFlow
@@ -12,7 +13,6 @@ import com.twofasapp.data.services.local.ServicesLocalSource
 import com.twofasapp.data.services.otp.ServiceCodeGenerator
 import com.twofasapp.data.services.otp.ServiceParser
 import com.twofasapp.data.services.remote.CloudSyncWorkDispatcher
-import com.twofasapp.common.domain.OtpAuthLink
 import com.twofasapp.prefs.model.RecentlyDeleted
 import com.twofasapp.prefs.model.RecentlyDeletedService
 import com.twofasapp.prefs.model.RemoteBackupStatusEntity
@@ -269,6 +269,10 @@ internal class ServicesRepositoryImpl(
         }
     }
 
+    override fun checkServiceValid(service: Service) {
+        codeGenerator.generate(service)
+    }
+
     override suspend fun addService(link: OtpAuthLink): Long {
         return withContext(dispatchers.io) {
             val service = ServiceParser.parseService(link)
diff --git a/feature/backup/src/main/java/com/twofasapp/feature/backup/ui/import/BackupImportScreen.kt b/feature/backup/src/main/java/com/twofasapp/feature/backup/ui/import/BackupImportScreen.kt
index b25663a8..6ecfb33e 100644
--- a/feature/backup/src/main/java/com/twofasapp/feature/backup/ui/import/BackupImportScreen.kt
+++ b/feature/backup/src/main/java/com/twofasapp/feature/backup/ui/import/BackupImportScreen.kt
@@ -32,9 +32,9 @@ import com.twofasapp.designsystem.common.TwButton
 import com.twofasapp.designsystem.common.TwCircularProgressIndicator
 import com.twofasapp.designsystem.common.TwTextButton
 import com.twofasapp.designsystem.common.TwTopAppBar
+import com.twofasapp.designsystem.dialog.InfoDialog
 import com.twofasapp.designsystem.dialog.PasswordDialog
 import com.twofasapp.designsystem.ktx.strings
-import com.twofasapp.designsystem.ktx.toastLong
 import com.twofasapp.designsystem.ktx.toastShort
 import org.koin.androidx.compose.koinViewModel
 
@@ -71,7 +71,9 @@ private fun ScreenContent(
     val context = LocalContext.current
     val strings = LocalContext.strings
     var showPasswordDialog by remember { mutableStateOf(false) }
-    var passwordDialogError by remember { mutableStateOf("") }
+    var passwordDialogMessage by remember { mutableStateOf("") }
+    var showErrorDialog by remember { mutableStateOf(false) }
+    var errorDialogMessage by remember { mutableStateOf("") }
 
     uiState.events.firstOrNull()?.let { event ->
         LaunchedEffect(Unit) {
@@ -79,12 +81,12 @@ private fun ScreenContent(
                 BackupImportUiEvent.ShowFilePicker -> onShowFilePicker()
                 BackupImportUiEvent.WrongPassword -> {
                     showPasswordDialog = true
-                    passwordDialogError = strings.backupIncorrectPassword
+                    passwordDialogMessage = strings.backupIncorrectPassword
                 }
 
                 BackupImportUiEvent.DecryptError -> {
                     showPasswordDialog = true
-                    passwordDialogError = strings.backupImportErrorDecryptError
+                    passwordDialogMessage = strings.backupImportErrorDecryptError
                 }
 
                 BackupImportUiEvent.ImportSuccess -> {
@@ -92,7 +94,15 @@ private fun ScreenContent(
                     onGoBack()
                 }
 
-                is BackupImportUiEvent.ImportError -> context.toastLong(event.msg.orEmpty())
+                is BackupImportUiEvent.InvalidSchemaError -> {
+                    showErrorDialog = true
+                    errorDialogMessage = strings.backupImportErrorInvalidSchema.format(event.currentVersion, event.importingVersion)
+                }
+
+                is BackupImportUiEvent.ImportError -> {
+                    showErrorDialog = true
+                    errorDialogMessage = event.msg.orEmpty()
+                }
             }
         }
 
@@ -241,11 +251,19 @@ private fun ScreenContent(
             title = strings.backupEnterPassword,
             body = strings.backupEnterPasswordDescription,
             positive = strings.commonContinue,
-            error = passwordDialogError,
+            error = passwordDialogMessage,
             confirmRequired = false,
             onPositive = { onPasswordConfirm(it) },
         )
     }
+
+    if (showErrorDialog) {
+        InfoDialog(
+            onDismissRequest = { showErrorDialog = false },
+            title = strings.commonError,
+            body = errorDialogMessage,
+        )
+    }
 }
 
 
diff --git a/feature/backup/src/main/java/com/twofasapp/feature/backup/ui/import/BackupImportUiState.kt b/feature/backup/src/main/java/com/twofasapp/feature/backup/ui/import/BackupImportUiState.kt
index c0bae26a..efc26f74 100644
--- a/feature/backup/src/main/java/com/twofasapp/feature/backup/ui/import/BackupImportUiState.kt
+++ b/feature/backup/src/main/java/com/twofasapp/feature/backup/ui/import/BackupImportUiState.kt
@@ -23,5 +23,6 @@ internal sealed interface BackupImportUiEvent {
     data object WrongPassword : BackupImportUiEvent
     data object DecryptError : BackupImportUiEvent
     data object ImportSuccess : BackupImportUiEvent
+    data class InvalidSchemaError(val currentVersion: Int, val importingVersion: Int) : BackupImportUiEvent
     data class ImportError(val msg: String?) : BackupImportUiEvent
 }
\ No newline at end of file
diff --git a/feature/backup/src/main/java/com/twofasapp/feature/backup/ui/import/BackupImportViewModel.kt b/feature/backup/src/main/java/com/twofasapp/feature/backup/ui/import/BackupImportViewModel.kt
index f0cfb23e..dcf70f1e 100644
--- a/feature/backup/src/main/java/com/twofasapp/feature/backup/ui/import/BackupImportViewModel.kt
+++ b/feature/backup/src/main/java/com/twofasapp/feature/backup/ui/import/BackupImportViewModel.kt
@@ -112,8 +112,19 @@ internal class BackupImportViewModel(
             runSafely { backupRepository.import(backupContent) }
                 .onSuccess { publishEvent(BackupImportUiEvent.ImportSuccess) }
                 .onFailure { e ->
+                    e.printStackTrace()
                     uiState.update { it.copy(importing = false) }
-                    publishEvent(BackupImportUiEvent.ImportError(e.message))
+
+                    if (backupContent.schemaVersion != BackupContent.CurrentSchema) {
+                        publishEvent(
+                            BackupImportUiEvent.InvalidSchemaError(
+                                currentVersion = BackupContent.CurrentSchema,
+                                importingVersion = backupContent.schemaVersion,
+                            )
+                        )
+                    } else {
+                        publishEvent(BackupImportUiEvent.ImportError(e.stackTraceToString()))
+                    }
                 }
         }
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1e2a40af..bb4c3fb4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 accompanist = "0.32.0"
-agp = "8.2.0-beta06"
+agp = "8.2.0-rc02"
 cameraX = "1.3.0"
 coil = "2.4.0"
 commonmark = "0.21.0"