diff --git a/app/src/main/java/com/aurora/extensions/Context.kt b/app/src/main/java/com/aurora/extensions/Context.kt
index e7addf2f1..fcea28f81 100644
--- a/app/src/main/java/com/aurora/extensions/Context.kt
+++ b/app/src/main/java/com/aurora/extensions/Context.kt
@@ -29,7 +29,6 @@ import android.content.pm.PackageManager
 import android.content.pm.verify.domain.DomainVerificationManager
 import android.content.pm.verify.domain.DomainVerificationUserState
 import android.graphics.Color
-import android.net.Uri
 import android.os.Bundle
 import android.os.Environment
 import android.os.PowerManager
@@ -45,6 +44,7 @@ import com.aurora.gplayapi.data.models.App
 import com.aurora.store.ComposeActivity
 import com.aurora.store.R
 import com.aurora.store.compose.navigation.Screen
+import androidx.core.net.toUri
 
 private const val TAG = "Context"
 
@@ -54,7 +54,7 @@ val Context.inflater: LayoutInflater
 fun Context.browse(url: String) {
     try {
         val customTabsIntent = CustomTabsIntent.Builder()
-        customTabsIntent.build().launchUrl(this, Uri.parse(url))
+        customTabsIntent.build().launchUrl(this, url.toUri())
     } catch (exception: Exception) {
         Log.e(TAG, "Failed to open custom tab", exception)
     }
@@ -78,7 +78,7 @@ fun Context.openInfo(packageName: String) {
     try {
         val intent = Intent(
             "android.settings.APPLICATION_DETAILS_SETTINGS",
-            Uri.parse("package:$packageName")
+            "package:$packageName".toUri()
         )
         startActivity(intent)
     } catch (exception: Exception) {
diff --git a/app/src/main/java/com/aurora/store/data/providers/PermissionProvider.kt b/app/src/main/java/com/aurora/store/data/providers/PermissionProvider.kt
index 8a0231081..27e1b101b 100644
--- a/app/src/main/java/com/aurora/store/data/providers/PermissionProvider.kt
+++ b/app/src/main/java/com/aurora/store/data/providers/PermissionProvider.kt
@@ -5,7 +5,6 @@ import android.annotation.SuppressLint
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.provider.Settings
 import android.provider.Settings.ACTION_APP_OPEN_BY_DEFAULT_SETTINGS
 import android.util.Log
@@ -25,6 +24,7 @@ import com.aurora.store.BuildConfig
 import com.aurora.store.R
 import com.aurora.store.data.model.PermissionType
 import com.aurora.store.util.PackageUtil
+import androidx.core.net.toUri
 
 class PermissionProvider(private val fragment: Fragment) :
     ActivityResultCallback<ActivityResult> {
@@ -142,11 +142,11 @@ class PermissionProvider(private val fragment: Fragment) :
             PermissionType.INSTALL_UNKNOWN_APPS to PackageUtil.getInstallUnknownAppsIntent(),
             PermissionType.DOZE_WHITELIST to Intent(
                 Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
-                Uri.parse("package:${BuildConfig.APPLICATION_ID}")
+                "package:${BuildConfig.APPLICATION_ID}".toUri()
             ),
             PermissionType.APP_LINKS to Intent(
                 ACTION_APP_OPEN_BY_DEFAULT_SETTINGS,
-                Uri.parse("package:${BuildConfig.APPLICATION_ID}")
+                "package:${BuildConfig.APPLICATION_ID}".toUri()
             )
         )
     }
diff --git a/app/src/main/java/com/aurora/store/data/work/ExportWorker.kt b/app/src/main/java/com/aurora/store/data/work/ExportWorker.kt
index 3e85fef65..019a882b4 100644
--- a/app/src/main/java/com/aurora/store/data/work/ExportWorker.kt
+++ b/app/src/main/java/com/aurora/store/data/work/ExportWorker.kt
@@ -24,6 +24,7 @@ import dagger.assisted.AssistedInject
 import java.io.File
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
+import androidx.core.net.toUri
 
 /**
  * An expedited worker to export downloaded or installed apps.
@@ -95,7 +96,7 @@ class ExportWorker @AssistedInject constructor(
 
     override suspend fun doWork(): Result {
         val isDownload = inputData.getBoolean(IS_DOWNLOAD, false)
-        val uri = Uri.parse(inputData.getString(URI))
+        val uri = inputData.getString(URI)!!.toUri()
         val packageName = inputData.getString(PACKAGE_NAME)
         val displayName = inputData.getString(DISPLAY_NAME)
         val versionCode = inputData.getInt(VERSION_CODE, -1)
diff --git a/app/src/main/java/com/aurora/store/util/PackageUtil.kt b/app/src/main/java/com/aurora/store/util/PackageUtil.kt
index 46c985c23..800159d29 100644
--- a/app/src/main/java/com/aurora/store/util/PackageUtil.kt
+++ b/app/src/main/java/com/aurora/store/util/PackageUtil.kt
@@ -28,7 +28,6 @@ import android.content.pm.PackageManager.PackageInfoFlags
 import android.content.pm.SharedLibraryInfo
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
-import android.net.Uri
 import android.os.Build
 import android.provider.Settings
 import android.util.Log
@@ -45,6 +44,7 @@ import com.aurora.extensions.isValidApp
 import com.aurora.store.BuildConfig
 import com.aurora.store.R
 import java.util.Locale
+import androidx.core.net.toUri
 
 object PackageUtil {
 
@@ -176,7 +176,7 @@ object PackageUtil {
     fun getStorageManagerIntent(context: Context): Intent {
         val intent = Intent(
             Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION,
-            Uri.parse("package:${BuildConfig.APPLICATION_ID}")
+            "package:${BuildConfig.APPLICATION_ID}".toUri()
         )
 
         // Check if the intent can be resolved
@@ -197,7 +197,7 @@ object PackageUtil {
         return if (isOAndAbove) {
             Intent(
                 Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES,
-                Uri.parse("package:${BuildConfig.APPLICATION_ID}")
+                "package:${BuildConfig.APPLICATION_ID}".toUri()
             )
         } else {
             Intent(Settings.ACTION_SECURITY_SETTINGS)
diff --git a/app/src/main/java/com/aurora/store/view/ui/preferences/UIPreference.kt b/app/src/main/java/com/aurora/store/view/ui/preferences/UIPreference.kt
index 3bcae7fbd..f72c340ec 100644
--- a/app/src/main/java/com/aurora/store/view/ui/preferences/UIPreference.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/preferences/UIPreference.kt
@@ -20,7 +20,6 @@
 package com.aurora.store.view.ui.preferences
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.provider.Settings
 import android.view.View
@@ -31,6 +30,7 @@ import com.aurora.extensions.isTAndAbove
 import com.aurora.store.R
 import dagger.hilt.android.AndroidEntryPoint
 import java.util.Locale
+import androidx.core.net.toUri
 
 @AndroidEntryPoint
 class UIPreference : BasePreferenceFragment() {
@@ -43,7 +43,7 @@ class UIPreference : BasePreferenceFragment() {
                 summary = Locale.getDefault().displayName
                 setOnPreferenceClickListener {
                     startActivity(Intent(Settings.ACTION_APP_LOCALE_SETTINGS).apply {
-                        data = Uri.parse("package:" + requireContext().packageName)
+                        data = ("package:" + requireContext().packageName).toUri()
                     })
                     true
                 }