diff --git a/app/src/androidTest/kotlin/ee/ria/DigiDoc/domain/preferences/DataStoreTest.kt b/app/src/androidTest/kotlin/ee/ria/DigiDoc/domain/preferences/DataStoreTest.kt
index 7800c631..221659f8 100644
--- a/app/src/androidTest/kotlin/ee/ria/DigiDoc/domain/preferences/DataStoreTest.kt
+++ b/app/src/androidTest/kotlin/ee/ria/DigiDoc/domain/preferences/DataStoreTest.kt
@@ -40,7 +40,6 @@ import ee.ria.DigiDoc.network.siva.SivaSetting
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.BeforeClass
diff --git a/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/WebEidViewModelTest.kt b/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/WebEidViewModelTest.kt
index badbc4fc..d118f580 100644
--- a/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/WebEidViewModelTest.kt
+++ b/app/src/androidTest/kotlin/ee/ria/DigiDoc/viewmodel/WebEidViewModelTest.kt
@@ -25,9 +25,7 @@ import android.net.Uri
 import android.util.Base64.URL_SAFE
 import android.util.Base64.decode
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import androidx.test.platform.app.InstrumentationRegistry
 import ee.ria.DigiDoc.R
-import ee.ria.DigiDoc.domain.preferences.DataStore
 import ee.ria.DigiDoc.webEid.WebEidAuthService
 import ee.ria.DigiDoc.webEid.WebEidSignService
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -60,8 +58,6 @@ class WebEidViewModelTest {
     @Mock
     private lateinit var signService: WebEidSignService
 
-    private lateinit var dataStore: DataStore
-
     private lateinit var viewModel: WebEidViewModel
 
     private val signingCertBase64Raw =
@@ -86,9 +82,7 @@ class WebEidViewModelTest {
     @Before
     fun setup() {
         MockitoAnnotations.openMocks(this)
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
-        dataStore = DataStore(context)
-        viewModel = WebEidViewModel(authService, signService, dataStore)
+        viewModel = WebEidViewModel(authService, signService)
     }
 
     @Test
diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/MainActivity.kt b/app/src/main/kotlin/ee/ria/DigiDoc/MainActivity.kt
index 07a41876..98ecdeac 100644
--- a/app/src/main/kotlin/ee/ria/DigiDoc/MainActivity.kt
+++ b/app/src/main/kotlin/ee/ria/DigiDoc/MainActivity.kt
@@ -29,6 +29,7 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.core.app.ActivityCompat
+import androidx.core.net.toUri
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
@@ -58,7 +59,6 @@ import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil
 import kotlinx.coroutines.launch
 import java.util.logging.Logger
 import javax.inject.Inject
-import androidx.core.net.toUri
 
 @AndroidEntryPoint
 class MainActivity :
@@ -204,14 +204,17 @@ class MainActivity :
     private fun isDarkModeEnabled(dataStore: DataStore): Boolean = dataStore.getThemeSetting() == ThemeSetting.DARK
 
     private fun resolveBrowserPackage(intent: Intent): String? =
-        (intent
-            .getStringExtra("com.android.browser.application_id")
-            ?.takeIf { it.isNotEmpty() }
-            ?: ActivityCompat.getReferrer(this)?.host) // TODO: This needs testing with App Link
+        (
+            intent
+                .getStringExtra("com.android.browser.application_id")
+                ?.takeIf { it.isNotEmpty() }
+                ?: ActivityCompat.getReferrer(this)?.host
+        ) // TODO: This needs testing with App Link
             ?.takeIf { pkg ->
-                val browseIntent = Intent(Intent.ACTION_VIEW, "https://".toUri()).apply {
-                    setPackage(pkg)
-                }
+                val browseIntent =
+                    Intent(Intent.ACTION_VIEW, "https://".toUri()).apply {
+                        setPackage(pkg)
+                    }
                 @Suppress("QueryPermissionsNeeded")
                 packageManager.resolveActivity(browseIntent, PackageManager.MATCH_DEFAULT_ONLY) != null
             }
diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/utils/WebEidUriUtil.kt b/app/src/main/kotlin/ee/ria/DigiDoc/utils/WebEidUriUtil.kt
index 1df7a055..b1bd4f36 100644
--- a/app/src/main/kotlin/ee/ria/DigiDoc/utils/WebEidUriUtil.kt
+++ b/app/src/main/kotlin/ee/ria/DigiDoc/utils/WebEidUriUtil.kt
@@ -23,14 +23,16 @@ package ee.ria.DigiDoc.utils
 
 import android.net.Uri
 
-enum class WebEidOperation(val operation: String) {
+enum class WebEidOperation(
+    val operation: String,
+) {
     AUTH("auth"),
     CERT("cert"),
-    SIGN("sign");
+    SIGN("sign"),
+    ;
 
     companion object {
-        fun fromOperation(operation: String): WebEidOperation? =
-            entries.find { it.operation == operation }
+        fun fromOperation(operation: String): WebEidOperation? = entries.find { it.operation == operation }
     }
 }
 
diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/NFCViewModel.kt b/app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/NFCViewModel.kt
index 61290acf..cfd9b4bf 100644
--- a/app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/NFCViewModel.kt
+++ b/app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/NFCViewModel.kt
@@ -765,7 +765,7 @@ class NFCViewModel
         }
 
         private fun showWebEidSigningCertificateMismatchError(e: Exception) {
-            _errorState.postValue(Triple(R.string.signature_update_nfc_wrong_certificate, null, null))
+            _errorState.postValue(Triple(R.string.web_eid_signing_card_mismatch, null, null))
             errorLog(
                 logTag,
                 "Web eID signing failed - signing certificate does not match previously used certificate",
diff --git a/app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/WebEidViewModel.kt b/app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/WebEidViewModel.kt
index 6def7a26..edc6ed3b 100644
--- a/app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/WebEidViewModel.kt
+++ b/app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/WebEidViewModel.kt
@@ -25,7 +25,6 @@ import android.net.Uri
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import ee.ria.DigiDoc.R
-import ee.ria.DigiDoc.domain.preferences.DataStore
 import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil.Companion.errorLog
 import ee.ria.DigiDoc.webEid.WebEidAuthService
 import ee.ria.DigiDoc.webEid.WebEidSignService
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 60f390a0..c336f3b7 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -289,7 +289,6 @@
     <string name="sign_blocked_pin2_unchanged_url">https://www.id.ee/artikkel/id-kaardi-pin-ja-puk-koodide-muutmine/</string>
     <string name="signature_update_signature_error_message_certificate_revoked">Sertifikaat on kehtetu</string>
     <string name="signature_update_signature_error_message_certificate_unknown">Sertifikaadi staatus on teadmata</string>
-    <string name="signature_update_nfc_wrong_certificate">Valitud ID-kaart ei vasta varem kasutatud sertifikaadile. Palun kasuta sama ID-kaarti, millega autentisid.</string>
     <string name="id_card_conditional_speech">ID-kaardi</string>
     <string name="mobile_id_conditional_speech">Mobiil-ID</string>
     <string name="smart_id_conditional_speech">Smart-ID</string>
@@ -683,4 +682,5 @@
     <string name="web_eid_request_error">Päringu viga</string>
     <string name="web_eid_invalid_auth_request_error">Vigane autentimispäring</string>
     <string name="signature_update_nfc_detection_timeout">Kaarti ei tuvastatud. Palun alusta uuesti.</string>
+    <string name="web_eid_signing_card_mismatch">Valitud ID-kaart ei vasta nõutud isikule. Palun kasuta õiget ID-kaarti.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0d220f85..3a4703b4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -289,7 +289,6 @@
     <string name="sign_blocked_pin2_unchanged_url">https://www.id.ee/en/article/changing-id-card-pin-codes-and-puk-code/</string>
     <string name="signature_update_signature_error_message_certificate_revoked">Certificate status revoked</string>
     <string name="signature_update_signature_error_message_certificate_unknown">Certificate status unknown</string>
-    <string name="signature_update_nfc_wrong_certificate">The selected ID card does not match the previously used certificate. Please use the same ID card you authenticated with.</string>
     <string name="id_card_conditional_speech">ID-card\'s</string>
     <string name="mobile_id_conditional_speech">Mobile-ID</string>
     <string name="smart_id_conditional_speech">Smart-ID</string>
@@ -683,4 +682,5 @@
     <string name="web_eid_request_error">Request error</string>
     <string name="web_eid_invalid_auth_request_error">Invalid authentication request</string>
     <string name="signature_update_nfc_detection_timeout">Card not detected. Please start again.</string>
+    <string name="web_eid_signing_card_mismatch">The selected ID card does not match the required person. Please use the correct ID card.</string>
 </resources>
\ No newline at end of file
diff --git a/utils-lib/src/main/kotlin/ee/ria/DigiDoc/utilsLib/file/FileUtil.kt b/utils-lib/src/main/kotlin/ee/ria/DigiDoc/utilsLib/file/FileUtil.kt
index 98a86828..29280f60 100644
--- a/utils-lib/src/main/kotlin/ee/ria/DigiDoc/utilsLib/file/FileUtil.kt
+++ b/utils-lib/src/main/kotlin/ee/ria/DigiDoc/utilsLib/file/FileUtil.kt
@@ -475,7 +475,12 @@ object FileUtil {
         intent.data?.takeIf { it.scheme in ALLOWED_FILE_SCHEMES }?.let { externalFileUris.add(it) }
         intent.clipData?.let { clipData ->
             for (i in 0 until clipData.itemCount) {
-                clipData.getItemAt(i)?.uri?.takeIf { it.scheme in ALLOWED_FILE_SCHEMES }?.let { externalFileUris.add(it) }
+                clipData
+                    .getItemAt(
+                        i,
+                    )?.uri
+                    ?.takeIf { it.scheme in ALLOWED_FILE_SCHEMES }
+                    ?.let { externalFileUris.add(it) }
             }
         }
         return externalFileUris