diff --git a/app/detekt-baseline.xml b/app/detekt-baseline.xml
index 4cf9c3c7f5618d9b4772d20f7c4060b4fd19df08..62a055a70f871fd0bc98a150dca97774c516dfd3 100644
--- a/app/detekt-baseline.xml
+++ b/app/detekt-baseline.xml
@@ -1,22 +1,4 @@
 <?xml version="1.0" ?>
-<!--
-  ~ Copyright (C) 2021-2024 MURENA SAS
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
-  ~
-  -->
-
 <SmellBaseline>
   <ManuallySuppressedIssues></ManuallySuppressedIssues>
   <CurrentIssues>
@@ -31,13 +13,13 @@
     <ID>InstanceOfCheckForException:GPlayHttpClient.kt$GPlayHttpClient$e is SocketTimeoutException</ID>
     <ID>InvalidPackageDeclaration:Trackers.kt$package foundation.e.apps.data.exodus</ID>
     <ID>LargeClass:ApplicationFragment.kt$ApplicationFragment : TimeoutFragment</ID>
-    <ID>LongParameterList:ApplicationDialogFragment.kt$ApplicationDialogFragment$( drawable: Int = -1, title: String, message: String, positiveButtonText: String = "", positiveButtonAction: (() -&gt; Unit)? = null, cancelButtonText: String = "", cancelButtonAction: (() -&gt; Unit)? = null, cancellable: Boolean = true, onDismissListener: (() -&gt; Unit)? = null, )</ID>
+    <ID>LongParameterList:ApplicationDialogFragment.kt$ApplicationDialogFragment$( drawable: Int = -1, title: String, message: String, positiveButtonText: String = "", positiveButtonAction: (() -&gt; Unit)? = null, cancelButtonText: String = "", cancelButtonAction: (() -&gt; Unit)? = null, cancelable: Boolean = true, onDismissListener: (() -&gt; Unit)? = null, )</ID>
     <ID>LongParameterList:ApplicationListRVAdapter.kt$ApplicationListRVAdapter$( private val applicationInstaller: ApplicationInstaller, private val privacyInfoViewModel: PrivacyInfoViewModel, private val appInfoFetchViewModel: AppInfoFetchViewModel, private val mainActivityViewModel: MainActivityViewModel, private val currentDestinationId: Int, private var lifecycleOwner: LifecycleOwner?, private var paidAppHandler: ((Application) -&gt; Unit)? = null )</ID>
     <ID>LongParameterList:ApplicationViewModel.kt$ApplicationViewModel$( id: String, packageName: String, origin: Origin, isFdroidLink: Boolean, authObjectList: List&lt;AuthObject&gt;, retryBlock: (failedObjects: List&lt;AuthObject&gt;) -&gt; Boolean, )</ID>
     <ID>LongParameterList:CleanApkRetrofit.kt$CleanApkRetrofit$( @Query("keyword") keyword: String, @Query("source") source: String = APP_SOURCE_FOSS, @Query("type") type: String = APP_TYPE_ANY, @Query("nres") nres: Int = 20, @Query("page") page: Int = 1, @Query("by") by: String? = null, )</ID>
     <ID>LongParameterList:EglExtensionProvider.kt$EglExtensionProvider$( egl10: EGL10, eglDisplay: EGLDisplay, eglConfig: EGLConfig?, ai: IntArray, ai1: IntArray?, set: MutableSet&lt;String&gt; )</ID>
     <ID>LongParameterList:FusedManagerImpl.kt$FusedManagerImpl$( @Named("cacheDir") private val cacheDir: String, private val downloadManager: DownloadManager, private val notificationManager: NotificationManager, private val fusedDownloadRepository: FusedDownloadRepository, private val pwaManager: PWAManager, private val appLoungePackageManager: AppLoungePackageManager, @Named("download") private val downloadNotificationChannel: NotificationChannel, @Named("update") private val updateNotificationChannel: NotificationChannel, @ApplicationContext private val context: Context )</ID>
-    <ID>LongParameterList:MainActivityViewModel.kt$MainActivityViewModel$( private val appLoungeDataStore: AppLoungeDataStore, private val applicationRepository: ApplicationRepository, private val fusedManagerRepository: FusedManagerRepository, private val appLoungePackageManager: AppLoungePackageManager, private val pwaManager: PWAManager, private val ecloudRepository: EcloudRepository, private val blockedAppRepository: BlockedAppRepository, private val appInstallProcessor: AppInstallProcessor, private val sessionPreference: SessionPreference )</ID>
+    <ID>LongParameterList:MainActivityViewModel.kt$MainActivityViewModel$( private val appLoungeDataStore: AppLoungeDataStore, private val applicationRepository: ApplicationRepository, private val fusedManagerRepository: FusedManagerRepository, private val appLoungePackageManager: AppLoungePackageManager, private val pwaManager: PWAManager, private val ecloudRepository: EcloudRepository, private val blockedAppRepository: BlockedAppRepository, private val appInstallProcessor: AppInstallProcessor, )</ID>
     <ID>LongParameterList:UpdatesManagerImpl.kt$UpdatesManagerImpl$( @ApplicationContext private val context: Context, private val appLoungePackageManager: AppLoungePackageManager, private val applicationRepository: ApplicationRepository, private val faultyAppRepository: FaultyAppRepository, private val appLoungePreference: AppLoungePreference, private val fdroidRepository: FdroidRepository, private val blockedAppRepository: BlockedAppRepository, )</ID>
     <ID>LongParameterList:UpdatesWorker.kt$UpdatesWorker$( @Assisted private val context: Context, @Assisted private val params: WorkerParameters, private val updatesManagerRepository: UpdatesManagerRepository, private val dataStoreManager: DataStoreManager, private val authenticatorRepository: AuthenticatorRepository, private val appInstallProcessor: AppInstallProcessor, private val blockedAppRepository: BlockedAppRepository, )</ID>
     <ID>MagicNumber:AnonymousLoginManager.kt$AnonymousLoginManager$200</ID>
@@ -74,7 +56,6 @@
     <ID>MagicNumber:PackageInstallerService.kt$PackageInstallerService$69</ID>
     <ID>MagicNumber:PkgManagerBR.kt$PkgManagerBR$69</ID>
     <ID>MagicNumber:PlayStoreLoginWrapper.kt$PlayStoreLoginWrapper$200</ID>
-    <ID>MagicNumber:RetrofitModule.kt$RetrofitModule$999</ID>
     <ID>MagicNumber:ScreenshotRVAdapter.kt$ScreenshotRVAdapter$10f</ID>
     <ID>MagicNumber:ScreenshotRVAdapter.kt$ScreenshotRVAdapter$50f</ID>
     <ID>MagicNumber:StorageComputer.kt$StorageComputer$1000</ID>
@@ -83,12 +64,10 @@
     <ID>MagicNumber:StorageComputer.kt$StorageComputer$999950</ID>
     <ID>MagicNumber:TOSFragment.kt$TOSFragment$20</ID>
     <ID>MaxLineLength:AppInstallProcessor.kt$AppInstallProcessor$"Enqueuing App install work is failed for ${fusedDownload.packageName} exception: ${e.localizedMessage}"</ID>
-    <ID>MaxLineLength:AppInstallProcessor.kt$AppInstallProcessor$fusedDownload.areFilesDownloaded() &amp;&amp; (!fusedManagerRepository.isFusedDownloadInstalled(fusedDownload) || fusedDownload.status == Status.INSTALLING)</ID>
     <ID>MaxLineLength:AppPrivacyInfo.kt$AppPrivacyInfo</ID>
     <ID>MaxLineLength:ApplicationFragment.kt$ApplicationFragment.Companion$"https://gitlab.e.foundation/e/os/apps/-/blob/main/app/src/main/java/foundation/e/apps/data/exodus/repositories/PrivacyScoreRepositoryImpl.kt"</ID>
     <ID>MaxLineLength:CommonUtilsModule.kt$CommonUtilsModule$*</ID>
     <ID>MaxLineLength:DownloadManager.kt$DownloadManager$Timber.e("Download Issue: $downloadId : DownloadManager returns status: $status but the failed because: reason: $reason")</ID>
-    <ID>MaxLineLength:DownloadManagerUtils.kt$DownloadManagerUtils$"Download failed for ${fusedDownload.packageName}, " + "reason: " + "${downloadManager.getDownloadFailureReason(downloadId)}"</ID>
     <ID>MaxLineLength:DownloadManagerUtils.kt$DownloadManagerUtils$Timber.d("===&gt; updateDownloadStatus: ${fusedDownload.name}: $downloadId: $numberOfDownloadedItems/${fusedDownload.downloadIdMap.size}")</ID>
     <ID>MaxLineLength:DownloadManagerUtils.kt$DownloadManagerUtils$if</ID>
     <ID>MaxLineLength:DownloadManagerUtils.kt$DownloadManagerUtils$numberOfDownloadedItems == fusedDownload.downloadIdMap.size &amp;&amp; numberOfDownloadedItems == fusedDownload.downloadURLList.size</ID>
@@ -112,13 +91,11 @@
     <ID>PrintStackTrace:CommonUtilsModule.kt$CommonUtilsModule$e</ID>
     <ID>PrintStackTrace:EcloudRepository.kt$EcloudRepository$e</ID>
     <ID>PrintStackTrace:InstallWorkManager.kt$InstallWorkManager$e</ID>
-    <ID>PrintStackTrace:AppLoungePackageManager.kt$PkgManagerModule$e</ID>
     <ID>PrintStackTrace:PlayStoreAuthenticator.kt$PlayStoreAuthenticator$e</ID>
     <ID>PrintStackTrace:SystemInfoProvider.kt$SystemInfoProvider$e</ID>
     <ID>ProtectedMemberInFinalClass:ApplicationListFragment.kt$ApplicationListFragment$// protected to avoid SyntheticAccessor protected val args: ApplicationListFragmentArgs by navArgs()</ID>
     <ID>ProtectedMemberInFinalClass:ApplicationListFragment.kt$ApplicationListFragment$// protected to avoid SyntheticAccessor protected val viewModel: ApplicationListViewModel by viewModels()</ID>
     <ID>ProtectedMemberInFinalClass:GoogleSignInFragment.kt$GoogleSignInFragment$// protected to avoid SyntheticAccessor protected val viewModel: LoginViewModel by lazy { ViewModelProvider(requireActivity())[LoginViewModel::class.java] }</ID>
-    <ID>ProtectedMemberInFinalClass:MainActivityViewModel.kt$MainActivityViewModel$protected fun ProducerScope&lt;Boolean&gt;.sendInternetStatus(connectivityManager: ConnectivityManager)</ID>
     <ID>ProtectedMemberInFinalClass:SearchFragment.kt$SearchFragment$protected val searchViewModel: SearchViewModel by viewModels()</ID>
     <ID>ReturnCount:ApkSignatureManager.kt$ApkSignatureManager$private fun verifyAPKSignature( apkInputStream: BufferedInputStream, apkSignatureInputStream: InputStream, publicKeyInputStream: InputStream, packageName: String ): Boolean</ID>
     <ID>ReturnCount:AppInstallProcessor.kt$AppInstallProcessor$private suspend fun updateDownloadUrls(fusedDownload: FusedDownload): Boolean</ID>
@@ -140,18 +117,19 @@
     <ID>SpreadOperator:NativeDeviceInfoProviderModule.kt$NativeDeviceInfoProviderModule$(*systemSharedLibraryNames)</ID>
     <ID>SwallowedException:AppInfoFetchViewModel.kt$AppInfoFetchViewModel$e: Exception</ID>
     <ID>SwallowedException:AppInstallProcessor.kt$AppInstallProcessor$e: ApiException.AppNotPurchased</ID>
+    <ID>SwallowedException:AppLoungePackageManager.kt$AppLoungePackageManager$e: PackageManager.NameNotFoundException</ID>
     <ID>SwallowedException:ApplicationViewModel.kt$ApplicationViewModel$e: ApiException.AppNotFound</ID>
     <ID>SwallowedException:ApplicationViewModel.kt$ApplicationViewModel$e: Exception</ID>
     <ID>SwallowedException:GPlayHttpClient.kt$GPlayHttpClient$e: Exception</ID>
     <ID>SwallowedException:NativeDeviceInfoProviderModule.kt$NativeDeviceInfoProviderModule$e: Exception</ID>
     <ID>SwallowedException:NativeGsfVersionProvider.kt$NativeGsfVersionProvider$e: PackageManager.NameNotFoundException</ID>
-    <ID>SwallowedException:AppLoungePackageManager.kt$AppLoungePackageManager$e: PackageManager.NameNotFoundException</ID>
     <ID>SwallowedException:UpdatesManagerImpl.kt$UpdatesManagerImpl$e: Exception</ID>
     <ID>TooGenericExceptionCaught:AnonymousLoginManager.kt$AnonymousLoginManager$e: Exception</ID>
     <ID>TooGenericExceptionCaught:ApiCaller.kt$e: Exception</ID>
     <ID>TooGenericExceptionCaught:ApkSignatureManager.kt$ApkSignatureManager$e: Exception</ID>
     <ID>TooGenericExceptionCaught:AppInfoFetchViewModel.kt$AppInfoFetchViewModel$e: Exception</ID>
     <ID>TooGenericExceptionCaught:AppInstallProcessor.kt$AppInstallProcessor$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:AppLoungePackageManager.kt$AppLoungePackageManager$e: Exception</ID>
     <ID>TooGenericExceptionCaught:ApplicationViewModel.kt$ApplicationViewModel$e: Exception</ID>
     <ID>TooGenericExceptionCaught:BlockedAppRepository.kt$BlockedAppRepository$exception: Exception</ID>
     <ID>TooGenericExceptionCaught:CommonUtilsModule.kt$CommonUtilsModule$e: Exception</ID>
@@ -170,15 +148,14 @@
     <ID>TooGenericExceptionCaught:NetworkHandler.kt$e: Exception</ID>
     <ID>TooGenericExceptionCaught:PWAManager.kt$PWAManager$e: Exception</ID>
     <ID>TooGenericExceptionCaught:PWAPlayerStatusReceiver.kt$PWAPlayerStatusReceiver$e: Exception</ID>
-    <ID>TooGenericExceptionCaught:AppLoungePackageManager.kt$AppLoungePackageManager$e: Exception</ID>
     <ID>TooGenericExceptionCaught:PlayStoreAuthenticator.kt$PlayStoreAuthenticator$e: Exception</ID>
-    <ID>TooGenericExceptionCaught:RetrofitModule.kt$RetrofitModule$e: Exception</ID>
     <ID>TooGenericExceptionCaught:SystemInfoProvider.kt$SystemInfoProvider$e: Exception</ID>
     <ID>TooGenericExceptionCaught:UpdatesManagerImpl.kt$UpdatesManagerImpl$e: Exception</ID>
     <ID>TooGenericExceptionCaught:UpdatesWorker.kt$UpdatesWorker$e: Throwable</ID>
     <ID>TooGenericExceptionThrown:AnonymousLoginManager.kt$AnonymousLoginManager$throw Exception( "Error fetching Anonymous credentials\n" + "Network code: ${response.code}\n" + "Success: ${response.isSuccessful}" + response.errorString.run { if (isNotBlank()) "\nError message: $this" else "" } )</ID>
     <ID>TooGenericExceptionThrown:PlayStoreLoginWrapper.kt$PlayStoreLoginWrapper$throw Exception("Validation network code: ${response.code}")</ID>
     <ID>TooGenericExceptionThrown:PlayStoreLoginWrapper.kt$PlayStoreLoginWrapper$throw Exception(error)</ID>
+    <ID>TooManyFunctions:AppLoungePackageManager.kt$AppLoungePackageManager</ID>
     <ID>TooManyFunctions:ApplicationListFragment.kt$ApplicationListFragment : TimeoutFragmentApplicationInstaller</ID>
     <ID>TooManyFunctions:ApplicationRepository.kt$ApplicationRepository</ID>
     <ID>TooManyFunctions:FusedManagerImpl.kt$FusedManagerImpl : IFusedManager</ID>
@@ -186,7 +163,6 @@
     <ID>TooManyFunctions:HomeFragment.kt$HomeFragment : TimeoutFragmentApplicationInstaller</ID>
     <ID>TooManyFunctions:IFusedManager.kt$IFusedManager</ID>
     <ID>TooManyFunctions:MainActivityViewModel.kt$MainActivityViewModel : ViewModel</ID>
-    <ID>TooManyFunctions:AppLoungePackageManager.kt$AppLoungePackageManager</ID>
     <ID>TooManyFunctions:SearchFragment.kt$SearchFragment : TimeoutFragmentOnQueryTextListenerOnSuggestionListenerApplicationInstaller</ID>
     <ID>TooManyFunctions:TimeoutFragment.kt$TimeoutFragment : Fragment</ID>
     <ID>TooManyFunctions:UpdatesFragment.kt$UpdatesFragment : TimeoutFragmentApplicationInstaller</ID>
diff --git a/app/src/main/java/foundation/e/apps/MainActivity.kt b/app/src/main/java/foundation/e/apps/MainActivity.kt
index 9ec898a0b769c65d60f5aa2ff86cd878f6c2d2b5..7b2b1217cad46ddb26e61bc8fb7a71899a33cfb2 100644
--- a/app/src/main/java/foundation/e/apps/MainActivity.kt
+++ b/app/src/main/java/foundation/e/apps/MainActivity.kt
@@ -70,6 +70,7 @@ class MainActivity : AppCompatActivity() {
 
     companion object {
         private val TAG = MainActivity::class.java.simpleName
+        private const val SESSION_DIALOG_TAG = "session_dialog"
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -123,17 +124,6 @@ class MainActivity : AppCompatActivity() {
         observeEvents()
     }
 
-    override fun onStart() {
-        super.onStart()
-        checkSessionRefresh()
-    }
-
-    private fun checkSessionRefresh() {
-        if (viewModel.shouldRefreshSession()) {
-            refreshSession()
-        }
-    }
-
     private fun refreshSession() {
         loginViewModel.startLoginFlow(listOf(PlayStoreAuthenticator::class.java.simpleName))
     }
@@ -145,6 +135,7 @@ class MainActivity : AppCompatActivity() {
     override fun onBackPressed() {
         if (isInitialScreen()) {
             resetIgnoreStatusForSessionRefresh()
+            finish()
         }
         super.onBackPressed()
     }
@@ -159,7 +150,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun resetIgnoreStatusForSessionRefresh() {
-        viewModel.updateIgnoreRefreshPreference(ignore = false)
+        viewModel.shouldIgnoreSessionError = false
     }
 
     @Suppress("DEPRECATION")
@@ -167,7 +158,7 @@ class MainActivity : AppCompatActivity() {
         if (VERSION.SDK_INT >= VERSION_CODES.TIRAMISU) {
             onBackInvokedDispatcher.registerOnBackInvokedCallback(PRIORITY_DEFAULT) {
                 resetIgnoreStatusForSessionRefresh()
-                super.onBackPressed() // Deprecated for Android 13+
+                finish()
             }
         }
     }
@@ -406,23 +397,37 @@ class MainActivity : AppCompatActivity() {
         EventBus.events.filter { appEvent ->
             appEvent is AppEvent.TooManyRequests
         }.collectLatest {
-            val shouldShowDialog = viewModel.shouldRefreshSession()
-            if (shouldShowDialog) {
-                binding.sessionErrorLayout.visibility = View.VISIBLE
-                binding.retrySessionButton.setOnClickListener { onRefreshSessionClick() }
-                binding.ignoreSessionButton.setOnClickListener { onIgnoreSessionClick() }
-            }
+            handleRefreshSessionEvent()
         }
     }
 
-    private fun onIgnoreSessionClick() {
-        viewModel.updateIgnoreRefreshPreference(true)
-        binding.sessionErrorLayout.visibility = View.GONE
+    private fun handleRefreshSessionEvent() {
+        val shouldShowDialog = !viewModel.shouldIgnoreSessionError
+        val isDialogShowing = supportFragmentManager.findFragmentByTag(SESSION_DIALOG_TAG) != null
+        if (shouldShowDialog && !isDialogShowing) {
+            showRefreshSessionDialog()
+        }
     }
 
-    private fun onRefreshSessionClick() {
-        binding.sessionErrorLayout.visibility = View.GONE
-        refreshSession()
+    private fun showRefreshSessionDialog() {
+        ApplicationDialogFragment(
+            title = getString(R.string.account_unavailable),
+            message = getString(R.string.too_many_requests_desc),
+            drawable = R.drawable.ic_warning,
+            positiveButtonText = getString(R.string.refresh_session),
+            positiveButtonAction = {
+                refreshSession()
+            },
+            cancelButtonText = getString(R.string.ignore).uppercase(),
+            cancelButtonAction = {
+                onIgnoreSessionClick()
+            },
+            cancelable = true,
+        ).show(supportFragmentManager, SESSION_DIALOG_TAG)
+    }
+
+    private fun onIgnoreSessionClick() {
+        viewModel.shouldIgnoreSessionError = true
     }
 
     private fun setupBottomNavItemSelectedListener(
diff --git a/app/src/main/java/foundation/e/apps/data/Constants.kt b/app/src/main/java/foundation/e/apps/data/Constants.kt
index 7e7bac60d5a25412f149ac5fbc04eeec5a7a3647..09b79b97272bf97efa745c8aa25876d0097667f4 100644
--- a/app/src/main/java/foundation/e/apps/data/Constants.kt
+++ b/app/src/main/java/foundation/e/apps/data/Constants.kt
@@ -30,6 +30,4 @@ object Constants {
 
     const val ACTION_DUMP_APP_INSTALL_STATE = "foundation.e.apps.action.APP_INSTALL_STATE"
     const val TAG_APP_INSTALL_STATE = "APP_INSTALL_STATE"
-
-    const val PREFERENCE_IGNORE_SESSION_REFRESH = "ignoreSessionRefresh"
 }
diff --git a/app/src/main/java/foundation/e/apps/data/preference/SessionPreference.kt b/app/src/main/java/foundation/e/apps/data/preference/SessionPreference.kt
deleted file mode 100644
index c5a50d3d2ac5f71480250e5fc4ef1667760c1c84..0000000000000000000000000000000000000000
--- a/app/src/main/java/foundation/e/apps/data/preference/SessionPreference.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021-2024 MURENA SAS
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-package foundation.e.apps.data.preference
-
-import android.content.Context
-import androidx.preference.PreferenceManager
-import dagger.hilt.android.qualifiers.ApplicationContext
-import foundation.e.apps.data.Constants.PREFERENCE_IGNORE_SESSION_REFRESH
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class SessionPreference @Inject constructor(
-    @ApplicationContext private val context: Context
-) {
-    private val preferenceManager = PreferenceManager.getDefaultSharedPreferences(context)
-
-    fun shouldIgnoreSessionRefresh(): Boolean {
-        return preferenceManager.getBoolean(PREFERENCE_IGNORE_SESSION_REFRESH, false)
-    }
-
-    fun updateIgnoreSessionRefreshPreference(ignore: Boolean) {
-        preferenceManager.edit().putBoolean(PREFERENCE_IGNORE_SESSION_REFRESH, ignore).apply()
-    }
-}
diff --git a/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt b/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt
index 3401e3c12504fa54786debb0c36a6a82c58ca4cd..9a54ffd78952f18707b411279171fce6a03bfef9 100644
--- a/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt
+++ b/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt
@@ -42,7 +42,6 @@ import foundation.e.apps.data.enums.isUnFiltered
 import foundation.e.apps.data.fusedDownload.FusedManagerRepository
 import foundation.e.apps.data.fusedDownload.models.FusedDownload
 import foundation.e.apps.data.preference.AppLoungeDataStore
-import foundation.e.apps.data.preference.SessionPreference
 import foundation.e.apps.data.preference.getSync
 import foundation.e.apps.install.pkg.AppLoungePackageManager
 import foundation.e.apps.install.pkg.PWAManager
@@ -61,7 +60,6 @@ class MainActivityViewModel @Inject constructor(
     private val ecloudRepository: EcloudRepository,
     private val blockedAppRepository: BlockedAppRepository,
     private val appInstallProcessor: AppInstallProcessor,
-    private val sessionPreference: SessionPreference
 ) : ViewModel() {
 
     val tocStatus: LiveData<Boolean> = appLoungeDataStore.tocStatus.asLiveData()
@@ -84,6 +82,8 @@ class MainActivityViewModel @Inject constructor(
 
     lateinit var connectivityManager: ConnectivityManager
 
+    var shouldIgnoreSessionError = false
+
     fun getUser(): User {
         return appLoungeDataStore.getUserType()
     }
@@ -240,12 +240,4 @@ class MainActivityViewModel @Inject constructor(
     fun launchPwa(application: Application) {
         pwaManager.launchPwa(application)
     }
-
-    fun updateIgnoreRefreshPreference(ignore: Boolean) {
-        sessionPreference.updateIgnoreSessionRefreshPreference(ignore)
-    }
-
-    fun shouldRefreshSession(): Boolean {
-        return !sessionPreference.shouldIgnoreSessionRefresh()
-    }
 }
diff --git a/app/src/main/java/foundation/e/apps/ui/application/subFrags/ApplicationDialogFragment.kt b/app/src/main/java/foundation/e/apps/ui/application/subFrags/ApplicationDialogFragment.kt
index c5702ec9dea6965629e85f1373c4f84c4ba4bc2b..7237822701ab6063183e6c98f60be13cd1f26dad 100644
--- a/app/src/main/java/foundation/e/apps/ui/application/subFrags/ApplicationDialogFragment.kt
+++ b/app/src/main/java/foundation/e/apps/ui/application/subFrags/ApplicationDialogFragment.kt
@@ -42,7 +42,7 @@ class ApplicationDialogFragment() : DialogFragment() {
     private var positiveButtonAction: (() -> Unit)? = null
     private var cancelButtonText: String? = null
     private var cancelButtonAction: (() -> Unit)? = null
-    private var cancellable: Boolean = true
+    private var cancelable: Boolean = true
     private var onDismissListener: (() -> Unit)? = null
 
     constructor(
@@ -53,7 +53,7 @@ class ApplicationDialogFragment() : DialogFragment() {
         positiveButtonAction: (() -> Unit)? = null,
         cancelButtonText: String = "",
         cancelButtonAction: (() -> Unit)? = null,
-        cancellable: Boolean = true,
+        cancelable: Boolean = true,
         onDismissListener: (() -> Unit)? = null,
     ) : this() {
         this.drawable = drawable
@@ -63,8 +63,9 @@ class ApplicationDialogFragment() : DialogFragment() {
         this.positiveButtonAction = positiveButtonAction
         this.cancelButtonText = cancelButtonText
         this.cancelButtonAction = cancelButtonAction
-        this.cancellable = cancellable
         this.onDismissListener = onDismissListener
+        this.cancelable = cancelable
+        isCancelable = cancelable
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
@@ -77,7 +78,6 @@ class ApplicationDialogFragment() : DialogFragment() {
                 positiveButtonAction?.invoke()
                 this.dismiss()
             }
-            .setCancelable(cancellable)
         if (cancelButtonText?.isNotEmpty() == true) {
             materialAlertDialogBuilder.setNegativeButton(cancelButtonText) { _, _ ->
                 cancelButtonAction?.invoke()
diff --git a/app/src/main/res/drawable/ic_warning.xml b/app/src/main/res/drawable/ic_warning.xml
new file mode 100644
index 0000000000000000000000000000000000000000..872b7286e80738469fe7d6145b7e345c2f487e68
--- /dev/null
+++ b/app/src/main/res/drawable/ic_warning.xml
@@ -0,0 +1,26 @@
+<!--
+  ~ Apps  Quickly and easily install Android apps onto your device!
+  ~ Copyright (C) 2022-2024  E FOUNDATION
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,13.5H11V15.5H9V13.5ZM9,5.5H11V11.5H9V5.5ZM9.99,0.5C4.47,0.5 0,4.98 0,10.5C0,16.02 4.47,20.5 9.99,20.5C15.52,20.5 20,16.02 20,10.5C20,4.98 15.52,0.5 9.99,0.5ZM10,18.5C5.58,18.5 2,14.92 2,10.5C2,6.08 5.58,2.5 10,2.5C14.42,2.5 18,6.08 18,10.5C18,14.92 14.42,18.5 10,18.5Z"
+      android:fillColor="?attr/colorControlNormal"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 66ff2e512436f8b55b6ff87da7ae1381124c453c..b2056ce54671e84b386ec2a77602684473bf186e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -23,71 +23,6 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <androidx.cardview.widget.CardView
-        android:id="@+id/sessionErrorLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        tools:visibility="visible"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginTop="20dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:cardElevation="8dp">
-
-        <RelativeLayout
-            android:id="@+id/errorMessagePanel"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/e_primary_text_color">
-
-            <TextView
-                android:id="@+id/errorMessageText"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:gravity="center_vertical"
-                android:textColor="@color/e_background"
-                app:drawableLeftCompat="@drawable/ic_warning_white"
-                android:drawablePadding="15dp"
-                android:text="@string/too_many_requests_desc" />
-
-            <TextView
-                android:id="@+id/retrySessionButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginBottom="15dp"
-                android:gravity="end"
-                android:text="@string/refresh_session"
-                android:textColor="@color/e_accent_inverse"
-                android:textSize="15sp"
-                android:textStyle="bold"
-                android:layout_alignParentEnd="true"
-                android:layout_below="@+id/errorMessageText"
-                />
-
-            <TextView
-                android:id="@+id/ignoreSessionButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/retrySessionButton"
-                android:layout_alignStart="@+id/retrySessionButton"
-                android:layout_alignEnd="@+id/retrySessionButton"
-                android:layout_alignParentEnd="true"
-                android:textAlignment="textEnd"
-                android:layout_marginEnd="16dp"
-                android:layout_marginBottom="15dp"
-                android:text="@string/ignore"
-                android:textColor="@color/e_accent_inverse" />
-        </RelativeLayout>
-
-    </androidx.cardview.widget.CardView>
-
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/noInternet"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4cb3a2fd6de00cec172ece2e0f2bf82755dcc179..47e45387da67b031185991d74c65c277520fc0bc 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -177,4 +177,5 @@
     <string name="notification_channel_desc">Split-Installationskanal</string>
     <string name="sign_in">Einloggen</string>
     <string name="ignore">Ignorieren</string>
+    <string name="account_unavailable">Konto nicht verfügbar</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 6d7a60c08c937056497277030285983018876be9..a3f4a87734c12bac499eba11989ea33b802122b0 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -177,4 +177,5 @@
 \n\t- mitigar el microtargeting  
 \n        - limitar el impacto en caso de que esta cuenta sea restringida por Google"</string>
     <string name="additional_file_for">Archivo adicional para %s</string>
+    <string name="account_unavailable">Cuenta no disponible</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 97a732be583e4e3f553590c23b02187baeab906c..7332e717322bc09e8e90a4b8ff8637433655a1e2 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -153,4 +153,5 @@
     <string name="login">Kirjaudu sisään</string>
     <string name="login_to_see_gplay_apps">Sinun on kirjauduttava sisään nähdäksesi yleiset sovellukset.</string>
     <string name="pwa_and_open_source_apps">PWA ja avoimen lähdekoodin sovellukset</string>
+    <string name="account_unavailable">Tili ei ole käytettävissä</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 77d6840b6b0410d8f63feff9e2fd229a2ae514b3..26a7d10813f171e5c7fa92cccf3168975ee93c2c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -173,4 +173,5 @@
     <string name="notification_channel_desc">Canal d\'installation fractionnée</string>
     <string name="sign_in">Connexion</string>
     <string name="ignore">Ignorer</string>
+    <string name="account_unavailable">Compte indisponible</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 7784682628780f05ed484ac960ed7c02096a592f..548808e9cd06f3e5fc87742eb1b86cf34c52b8b6 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -176,4 +176,5 @@
     <string name="split_install_warning_title">Aðvörun viðkomandi %s</string>
     <string name="split_install_warning_text">%s vill fá að setja upp viðbótareiningar.Þú þarft að skrá þig aftur inn í AppLounge til að geta sett þær inn.</string>
     <string name="sign_in">Skrá inn</string>
+    <string name="account_unavailable">Reikningur ekki í boði</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a06fe7b42faa9db276a51b336c27dc4cbcb6a4d6..46c6e9b55a6b555a60b050195f9f4fd1b62b9d0d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -177,4 +177,5 @@
     <string name="request_exodus_report_confirm_dialog">Toccando su \"<xliff:g id="ok">%1$s</xliff:g>\" verrà aperto un tab sul tuo browser con il nome del pacchetto app preimpostato.&lt;br /&gt;&lt;br /&gt;Tocca su \"Perform analysis\" per aviare l\'analisi da parte di Exodus.&lt;br /&gt;&lt;br /&gt;Quando verrò mostrato il pulsante \"See the report\" (potrebbe volerci un pò di tempo, a seconda dell\'app scelta) puoi chiudere il tab e tornare alla descrizione app su <xliff:g id="app_name">%2$s</xliff:g> dove dovresti vedere il Punteggio Privacy. A volte Exodus non riesce ad analizzare l\'app.&lt;br /&gt;&lt;br /&gt;NB: potresti dover aspettare anche 10 min per poter vedere il punteggio nella descrizione app.</string>
     <string name="too_many_requests_desc">L\'account anonimo che stai utilizzando non è disponibile. Agiorna la sessione per ottenerne un altro.</string>
     <string name="refresh_session">AGGIORNA SESSIONE</string>
+    <string name="account_unavailable">Account non disponibile</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index d127090b66c3f0b1e02a77709a4f548f026bca5f..4fc1145fabe33f903468c2ff8e1d2c70327e7e30 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -176,4 +176,5 @@
     <string name="split_install_warning_title">Advarsel angående %s</string>
     <string name="split_install_warning_text">%s vil installere ekstra moduler. Du må logge inn på App Lounge på nytt for å kunne installere dem.</string>
     <string name="sign_in">Logg inn</string>
+    <string name="account_unavailable">Konto utilgjengelig</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index cd5d91f7b09e469311befa83b9ccb4b7bafebcea..9575856995a9db4852d1a7efb17ee870128977f4 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -156,4 +156,5 @@
     <string name="downloading">Downloaden…</string>
     <string name="additional_file_for">Aanvullend bestand voor %s</string>
     <string name="preference_update_apps_from_other_stores_title">Update apps geïnstalleerd door andere app-stores</string>
+    <string name="account_unavailable">Account niet beschikbaar</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index dcd14689e80e25a70def86b8ca424ac01ef15ef1..89fe24e1d496a3bffd39ad51dbc73700a39e6959 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -155,4 +155,5 @@
     <string name="login_to_see_gplay_apps">Необходимо войти в систему, чтобы увидеть обычные приложения.</string>
     <string name="select_one_source_of_applications">Пожалуйста, выберите хотя бы один источник приложений.</string>
     <string name="logout">Выйти из системы</string>
+    <string name="account_unavailable">Аккаунт недоступен</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 500d1e997440b183e5b91049ddc6ddab70970daa..67e4b3516770fe0e87a95c08e34178eed36d0dd3 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -25,4 +25,5 @@
     <string name="menu_search">Hľadať</string>
     <string name="menu_categories">Kategórie</string>
     <string name="menu_home">Domov</string>
+    <string name="account_unavailable">Účet nedostupný</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index b1eb1f3f183af4cf35404055caa24bb5d0a06971..f2d8d2440fe41f3d33d58798b171c4bc07aea06b 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -176,4 +176,5 @@
     <string name="split_install_warning_title">Varning gällande %s</string>
     <string name="split_install_warning_text">%s vill installera extra moduler. Du måste logga in till AppLounge igen för att kunna installera dom.</string>
     <string name="sign_in">Logga in</string>
+    <string name="account_unavailable">Konto otillgängligt</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 88eac496b13ae03a67c777ba98dcea99962226b8..a276b3660e0866bfb1f560a74596be176c040843 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -156,4 +156,5 @@
 \n
 \nНатисніть «Повторити спробу» щоб спробувати знову.</string>
     <string name="sign_in">Зареєструватися</string>
+    <string name="account_unavailable">Обліковий запис недоступний</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 6a53870477a514909d346408782e8505f30e228d..2cd4f7fb59636738af2a05f40dd356f162e0daf5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -182,6 +182,7 @@
     <string name="more_info"><u>More info</u></string>
     <!--Too many request-->
     <string name="too_many_requests_desc">The anonymous account you\'re currently using is unavailable. Please refresh the session to get another one.</string>
+    <string name="account_unavailable">Account unavailable</string>
     <string name="refresh_session">REFRESH SESSION</string>
     <!--Data load error-->
     <string name="data_load_error">Error occurred while loading apps.</string>