diff --git a/app/src/main/java/org/schabi/newpipe/settings/ExtraSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ExtraSettingsFragment.java
index 0eaac6f07..a5e1ea407 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ExtraSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ExtraSettingsFragment.java
@@ -2,11 +2,9 @@ package org.schabi.newpipe.settings;
 
 import android.os.Bundle;
 
-import org.schabi.newpipe.R;
-
 public class ExtraSettingsFragment extends BasePreferenceFragment {
     @Override
     public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
-        addPreferencesFromResource(R.xml.extra_settings);
+        addPreferencesFromResourceRegistry();
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsResourceRegistry.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsResourceRegistry.java
index 749a00f1c..ebee9b3d3 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsResourceRegistry.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsResourceRegistry.java
@@ -39,8 +39,8 @@ public final class SettingsResourceRegistry {
         add(NotificationSettingsFragment.class, R.xml.notification_settings);
         add(UpdateSettingsFragment.class, R.xml.update_settings);
         add(VideoAudioSettingsFragment.class, R.xml.video_audio_settings);
-        add(VideoAudioSettingsFragment.class, R.xml.sponsor_block_settings);
-        add(VideoAudioSettingsFragment.class, R.xml.extra_settings);
+        add(SponsorBlockSettingsFragment.class, R.xml.sponsor_block_settings);
+        add(ExtraSettingsFragment.class, R.xml.extra_settings);
     }
 
     private SettingRegistryEntry add(
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SponsorBlockCategoriesSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SponsorBlockCategoriesSettingsFragment.java
index cf5ae1fa6..d261c2899 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SponsorBlockCategoriesSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SponsorBlockCategoriesSettingsFragment.java
@@ -21,7 +21,7 @@ public class SponsorBlockCategoriesSettingsFragment extends BasePreferenceFragme
 
     @Override
     public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
-        addPreferencesFromResource(R.xml.sponsor_block_category_settings);
+        addPreferencesFromResourceRegistry();
 
         final Preference resetPreference =
                 findPreference(getString(R.string.sponsor_block_category_reset_key));
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SponsorBlockSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SponsorBlockSettingsFragment.java
index f3b8fc0eb..94408d9cb 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SponsorBlockSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SponsorBlockSettingsFragment.java
@@ -19,7 +19,7 @@ public class SponsorBlockSettingsFragment extends BasePreferenceFragment {
 
     @Override
     public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
-        addPreferencesFromResource(R.xml.sponsor_block_settings);
+        addPreferencesFromResourceRegistry();
 
         final Preference sponsorBlockWebsitePreference =
                 findPreference(getString(R.string.sponsor_block_home_page_key));