diff --git a/Core b/Core
index f405b946f3..19a1c23a00 160000
--- a/Core
+++ b/Core
@@ -1 +1 @@
-Subproject commit f405b946f30308e16dbbac79186c89e490d93f65
+Subproject commit 19a1c23a00a2c05435ef2d77821168eb83506161
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cadc95f09b..a76f5686fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -227,7 +227,7 @@
             android:theme="@style/WebViewTheme" />
 
         <activity
-            android:name="com.infomaniak.core.applock.LockActivity"
+            android:name="com.infomaniak.core.applock.view.AppLockViewActivity"
             android:launchMode="singleTop"
             android:theme="@style/AppTheme.Lock" />
 
diff --git a/app/src/main/java/com/infomaniak/drive/ui/MainActivity.kt b/app/src/main/java/com/infomaniak/drive/ui/MainActivity.kt
index 8f6dec69a0..4232926ce1 100644
--- a/app/src/main/java/com/infomaniak/drive/ui/MainActivity.kt
+++ b/app/src/main/java/com/infomaniak/drive/ui/MainActivity.kt
@@ -61,12 +61,13 @@ import com.google.android.material.bottomnavigation.BottomNavigationMenuView
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.navigation.NavigationBarItemView
 import com.google.android.material.snackbar.Snackbar
+import com.infomaniak.core.applock.AppLockManager
+import com.infomaniak.core.applock.view.AppLockViewActivity
 import com.infomaniak.core.common.observe
 import com.infomaniak.core.inappreview.BaseInAppReviewManager
 import com.infomaniak.core.inappreview.reviewmanagers.InAppReviewManager
 import com.infomaniak.core.inappreview.view.ReviewAlertDialog
 import com.infomaniak.core.inappreview.view.ReviewAlertDialogData
-import com.infomaniak.core.applock.LockActivity
 import com.infomaniak.core.legacy.utils.CoilUtils.simpleImageLoader
 import com.infomaniak.core.legacy.utils.SnackbarUtils.showIndefiniteSnackbar
 import com.infomaniak.core.legacy.utils.SnackbarUtils.showSnackbar
@@ -119,6 +120,7 @@ import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import kotlin.coroutines.resume
+import kotlin.jvm.java
 import com.infomaniak.core.legacy.R as RCore
 
 @AndroidEntryPoint
@@ -202,8 +204,9 @@ class MainActivity : BaseActivity() {
         observeDownloadCancellation()
         observeFailureDownloadWorkerOffline()
 
-        LockActivity.scheduleLockIfNeeded(
+        AppLockManager.scheduleLockIfNeeded(
             targetActivity = this,
+            lockActivityCls = AppLockViewActivity::class.java,
             isAppLockEnabled = { AppSettings.appSecurityLock }
         )
 
diff --git a/app/src/main/java/com/infomaniak/drive/ui/SaveExternalFilesActivity.kt b/app/src/main/java/com/infomaniak/drive/ui/SaveExternalFilesActivity.kt
index 2bfc8e3309..e87419e28a 100644
--- a/app/src/main/java/com/infomaniak/drive/ui/SaveExternalFilesActivity.kt
+++ b/app/src/main/java/com/infomaniak/drive/ui/SaveExternalFilesActivity.kt
@@ -37,9 +37,10 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.navArgs
 import com.google.android.material.textfield.TextInputEditText
+import com.infomaniak.core.applock.AppLockManager
+import com.infomaniak.core.applock.view.AppLockViewActivity
 import com.infomaniak.core.common.utils.FORMAT_NEW_FILE
 import com.infomaniak.core.common.utils.format
-import com.infomaniak.core.applock.LockActivity
 import com.infomaniak.core.legacy.utils.SnackbarUtils.showSnackbar
 import com.infomaniak.core.legacy.utils.getFileName
 import com.infomaniak.core.legacy.utils.hideProgressCatching
@@ -132,8 +133,9 @@ class SaveExternalFilesActivity : BaseActivity() {
 
         fileNameEdit.selectAllButFileExtension()
 
-        LockActivity.scheduleLockIfNeeded(
+        AppLockManager.scheduleLockIfNeeded(
             targetActivity = this@SaveExternalFilesActivity,
+            lockActivityCls = AppLockViewActivity::class.java,
             isAppLockEnabled = { AppSettings.appSecurityLock }
         )
     }
diff --git a/app/src/main/java/com/infomaniak/drive/ui/menu/settings/AppSecuritySettingsActivity.kt b/app/src/main/java/com/infomaniak/drive/ui/menu/settings/AppSecuritySettingsActivity.kt
index c39aa676e1..12a8163cec 100644
--- a/app/src/main/java/com/infomaniak/drive/ui/menu/settings/AppSecuritySettingsActivity.kt
+++ b/app/src/main/java/com/infomaniak/drive/ui/menu/settings/AppSecuritySettingsActivity.kt
@@ -21,8 +21,8 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import com.infomaniak.core.applock.LockActivity
-import com.infomaniak.core.applock.Utils.silentlyReverseSwitch
+import com.infomaniak.core.applock.AppLockHelper.silentlyReverseSwitch
+import com.infomaniak.core.applock.AppLockManager
 import com.infomaniak.core.twofactorauth.front.TwoFactorAuthApprovalAutoManagedBottomSheet
 import com.infomaniak.core.twofactorauth.front.addComposeOverlay
 import com.infomaniak.drive.R
@@ -54,7 +54,7 @@ class AppSecuritySettingsActivity : AppCompatActivity() {
                 // Reverse switch (before official parameter changed) by silent click
                 silentlyReverseSwitch(this) { shouldLock ->
                     AppSettings.appSecurityLock = shouldLock
-                    if (shouldLock) LockActivity.unlock()
+                    if (shouldLock) AppLockManager.unlock()
                 }
             }
         }
diff --git a/app/src/main/java/com/infomaniak/drive/ui/menu/settings/SettingsFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/menu/settings/SettingsFragment.kt
index 1d86c31931..82a19dfa1b 100644
--- a/app/src/main/java/com/infomaniak/drive/ui/menu/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/infomaniak/drive/ui/menu/settings/SettingsFragment.kt
@@ -34,6 +34,7 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.infomaniak.core.applock.AppLockManager
 import com.infomaniak.core.auth.room.UserDatabase
 import com.infomaniak.core.bugtracker.BugTrackerActivity
 import com.infomaniak.core.bugtracker.BugTrackerActivityArgs
@@ -41,7 +42,6 @@ import com.infomaniak.core.crossapplogin.back.CrossAppLogin
 import com.infomaniak.core.fragmentnavigation.safelyNavigate
 import com.infomaniak.core.ksuite.myksuite.ui.data.MyKSuiteData
 import com.infomaniak.core.ksuite.ui.utils.MatomoKSuite
-import com.infomaniak.core.applock.LockActivity
 import com.infomaniak.core.legacy.ui.WebViewActivity
 import com.infomaniak.core.legacy.utils.UtilsUi.openUrl
 import com.infomaniak.core.legacy.utils.getBackNavigationResult
@@ -94,7 +94,7 @@ class SettingsFragment : Fragment() {
         themeSettings.setOnClickListener { openThemeSettings() }
         notifications.setOnClickListener { requireContext().openAppNotificationSettings() }
         appSecurity.apply {
-            if (LockActivity.hasBiometrics()) {
+            if (AppLockManager.hasBiometrics()) {
                 isVisible = true
                 setOnClickListener {
                     trackSettingsEvent(MatomoName.LockApp)