diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
index f8a6f0f4d..16bdb6a13 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt
@@ -207,7 +207,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         super.onActivityResult(requestCode, resultCode, data)
         if (data != null && data.data != null && resultCode == Activity.RESULT_OK) {
             if (requestCode == REQUEST_EXPORT_CODE) {
-                val exportFile = Utils.getFileForUri(data.data!!)
+                val exportFile = Utils.getFileForUri(data.data!!)!!
                 if (!exportFile.parentFile.canWrite() || !exportFile.parentFile.canRead()) {
                     Toast.makeText(activity, R.string.invalid_directory, Toast.LENGTH_SHORT).show()
                 } else {
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
index 2918bcd66..cb0c5fe35 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
@@ -9,6 +9,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import androidx.core.content.getSystemService
 import androidx.core.os.bundleOf
 import androidx.core.view.isGone
@@ -127,7 +128,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
 
         if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.LOLLIPOP) {
             // KitKat doesn't apply container's theme to <include> content
-            val contrastColor = ColorStateList.valueOf(resources.getColor(R.color.contrastColor))
+            val contrastColor = ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.contrastColor))
             searchLayoutBinding.toolbarSearchEditText.setTextColor(contrastColor)
             searchLayoutBinding.toolbarSearchEditText.setHintTextColor(contrastColor.withAlpha(128))
             ImageViewCompat.setImageTintList(searchLayoutBinding.toolbarSearchClearIcon, contrastColor)
@@ -385,7 +386,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
 
     private fun setupIconPicker() {
         val groupAdapter = GroupAdapter<GroupieViewHolder>()
-        groupAdapter.addAll(FeedGroupIcon.values().map { PickerIconItem(requireContext(), it) })
+        groupAdapter.addAll(FeedGroupIcon.values().map { PickerIconItem(it) })
 
         feedGroupCreateBinding.iconSelector.apply {
             layoutManager = GridLayoutManager(requireContext(), 7, RecyclerView.VERTICAL, false)
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerIconItem.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerIconItem.kt
index 1b55d2e85..b4232f666 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerIconItem.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/item/PickerIconItem.kt
@@ -1,6 +1,5 @@
 package org.schabi.newpipe.local.subscription.item
 
-import android.content.Context
 import android.view.View
 import androidx.annotation.DrawableRes
 import com.xwray.groupie.viewbinding.BindableItem
@@ -9,7 +8,6 @@ import org.schabi.newpipe.databinding.PickerIconItemBinding
 import org.schabi.newpipe.local.subscription.FeedGroupIcon
 
 class PickerIconItem(
-    context: Context,
     val icon: FeedGroupIcon
 ) : BindableItem<PickerIconItemBinding>() {
     @DrawableRes