diff --git a/...id/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java b/...id/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java
@@ -2,6 +2,8 @@
 
 package org.dolphinemu.dolphinemu.features.settings.model;
 
+import androidx.annotation.NonNull;
+
 import org.dolphinemu.dolphinemu.NativeLibrary;
 
 import java.util.Arrays;
@@ -63,7 +65,7 @@ public enum StringSetting implements AbstractStringSetting
   }
 
   @Override
-  public boolean isOverridden(Settings settings)
+  public boolean isOverridden(@NonNull Settings settings)
   {
     if (settings.isGameSpecific() && !NativeConfig.isSettingSaveable(mFile, mSection, mKey))
       return settings.getSection(mFile, mSection).exists(mKey);
@@ -84,7 +86,7 @@ public boolean isRuntimeEditable()
   }
 
   @Override
-  public boolean delete(Settings settings)
+  public boolean delete(@NonNull Settings settings)
   {
     if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
     {
@@ -96,8 +98,8 @@ public boolean delete(Settings settings)
     }
   }
 
-  @Override
-  public String getString(Settings settings)
+  @NonNull @Override
+  public String getString(@NonNull Settings settings)
   {
     if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
     {
@@ -111,7 +113,7 @@ public String getString(Settings settings)
   }
 
   @Override
-  public void setString(Settings settings, String newValue)
+  public void setString(@NonNull Settings settings, @NonNull String newValue)
   {
     if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
     {

diff --git a/.../java/org/dolphinemu/dolphinemu/features/settings/model/WiimoteProfileBooleanSetting.java b/.../java/org/dolphinemu/dolphinemu/features/settings/model/WiimoteProfileBooleanSetting.java
@@ -2,6 +2,8 @@
 
 package org.dolphinemu.dolphinemu.features.settings.model;
 
+import androidx.annotation.NonNull;
+
 import org.dolphinemu.dolphinemu.features.settings.utils.SettingsFile;
 
 // This stuff is pretty ugly. It's a kind of workaround for certain controller settings
@@ -32,7 +34,7 @@ public WiimoteProfileBooleanSetting(String gameID, int padID, String section, St
   }
 
   @Override
-  public boolean isOverridden(Settings settings)
+  public boolean isOverridden(@NonNull Settings settings)
   {
     return settings.isWiimoteProfileEnabled(settings, mProfile, mProfileKey);
   }
@@ -44,13 +46,13 @@ public boolean isRuntimeEditable()
   }
 
   @Override
-  public boolean delete(Settings settings)
+  public boolean delete(@NonNull Settings settings)
   {
     return settings.disableWiimoteProfile(settings, mProfileKey);
   }
 
   @Override
-  public boolean getBoolean(Settings settings)
+  public boolean getBoolean(@NonNull Settings settings)
   {
     if (settings.isWiimoteProfileEnabled(settings, mProfile, mProfileKey))
       return settings.getWiimoteProfile(mProfile, mPadID).getBoolean(mSection, mKey, mDefaultValue);
@@ -59,7 +61,7 @@ public boolean getBoolean(Settings settings)
   }
 
   @Override
-  public void setBoolean(Settings settings, boolean newValue)
+  public void setBoolean(@NonNull Settings settings, boolean newValue)
   {
     settings.getWiimoteProfile(mProfile, mPadID).setBoolean(mSection, mKey, newValue);
 

diff --git a/...n/java/org/dolphinemu/dolphinemu/features/settings/model/WiimoteProfileStringSetting.java b/...n/java/org/dolphinemu/dolphinemu/features/settings/model/WiimoteProfileStringSetting.java
@@ -2,6 +2,8 @@
 
 package org.dolphinemu.dolphinemu.features.settings.model;
 
+import androidx.annotation.NonNull;
+
 import org.dolphinemu.dolphinemu.features.settings.utils.SettingsFile;
 
 // This stuff is pretty ugly. It's a kind of workaround for certain controller settings
@@ -32,7 +34,7 @@ public WiimoteProfileStringSetting(String gameID, int padID, String section, Str
   }
 
   @Override
-  public boolean isOverridden(Settings settings)
+  public boolean isOverridden(@NonNull Settings settings)
   {
     return settings.isWiimoteProfileEnabled(settings, mProfile, mProfileKey);
   }
@@ -44,13 +46,13 @@ public boolean isRuntimeEditable()
   }
 
   @Override
-  public boolean delete(Settings settings)
+  public boolean delete(@NonNull Settings settings)
   {
     return settings.disableWiimoteProfile(settings, mProfileKey);
   }
 
-  @Override
-  public String getString(Settings settings)
+  @NonNull @Override
+  public String getString(@NonNull Settings settings)
   {
     if (settings.isWiimoteProfileEnabled(settings, mProfile, mProfileKey))
       return settings.getWiimoteProfile(mProfile, mPadID).getString(mSection, mKey, mDefaultValue);
@@ -59,7 +61,7 @@ public String getString(Settings settings)
   }
 
   @Override
-  public void setString(Settings settings, String newValue)
+  public void setString(@NonNull Settings settings, @NonNull String newValue)
   {
     settings.getWiimoteProfile(mProfile, mPadID).setString(mSection, mKey, newValue);
 

diff --git a/...main/java/org/dolphinemu/dolphinemu/features/settings/model/view/DateTimeChoiceSetting.kt b/...main/java/org/dolphinemu/dolphinemu/features/settings/model/view/DateTimeChoiceSetting.kt
@@ -21,7 +21,7 @@ class DateTimeChoiceSetting(
         return setting
     }
 
-    fun setSelectedValue(settings: Settings?, selection: String) {
+    fun setSelectedValue(settings: Settings, selection: String) {
         setting.setString(settings, selection)
     }
 

diff --git a/...c/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/...c/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
@@ -8,6 +8,7 @@
 import android.os.Bundle;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
 import org.dolphinemu.dolphinemu.NativeLibrary;
@@ -22,6 +23,7 @@
 import org.dolphinemu.dolphinemu.features.settings.model.IntSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.LegacyStringSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.PostProcessing;
+import org.dolphinemu.dolphinemu.features.settings.model.ScaledIntSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
 import org.dolphinemu.dolphinemu.features.settings.model.StringSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.WiimoteProfileStringSetting;
@@ -333,7 +335,7 @@ private void addInterfaceSettings(ArrayList<SettingsItem> sl)
     AbstractIntSetting appTheme = new AbstractIntSetting()
     {
       @Override
-      public boolean isOverridden(Settings settings)
+      public boolean isOverridden(@NonNull Settings settings)
       {
         return IntSetting.MAIN_INTERFACE_THEME.isOverridden(settings);
       }
@@ -346,20 +348,20 @@ public boolean isRuntimeEditable()
       }
 
       @Override
-      public boolean delete(Settings settings)
+      public boolean delete(@NonNull Settings settings)
       {
         ThemeHelper.deleteThemeKey((AppCompatActivity) mView.getActivity());
         return IntSetting.MAIN_INTERFACE_THEME.delete(settings);
       }
 
       @Override
-      public int getInt(Settings settings)
+      public int getInt(@NonNull Settings settings)
       {
         return IntSetting.MAIN_INTERFACE_THEME.getInt(settings);
       }
 
       @Override
-      public void setInt(Settings settings, int newValue)
+      public void setInt(@NonNull Settings settings, int newValue)
       {
         IntSetting.MAIN_INTERFACE_THEME.setInt(settings, newValue);
         ThemeHelper.saveTheme((AppCompatActivity) mView.getActivity(), newValue);
@@ -381,7 +383,7 @@ public void setInt(Settings settings, int newValue)
     AbstractIntSetting themeMode = new AbstractIntSetting()
     {
       @Override
-      public boolean isOverridden(Settings settings)
+      public boolean isOverridden(@NonNull Settings settings)
       {
         return IntSetting.MAIN_INTERFACE_THEME_MODE.isOverridden(settings);
       }
@@ -394,20 +396,20 @@ public boolean isRuntimeEditable()
       }
 
       @Override
-      public boolean delete(Settings settings)
+      public boolean delete(@NonNull Settings settings)
       {
         ThemeHelper.deleteThemeModeKey((AppCompatActivity) mView.getActivity());
         return IntSetting.MAIN_INTERFACE_THEME_MODE.delete(settings);
       }
 
       @Override
-      public int getInt(Settings settings)
+      public int getInt(@NonNull Settings settings)
       {
         return IntSetting.MAIN_INTERFACE_THEME_MODE.getInt(settings);
       }
 
       @Override
-      public void setInt(Settings settings, int newValue)
+      public void setInt(@NonNull Settings settings, int newValue)
       {
         IntSetting.MAIN_INTERFACE_THEME_MODE.setInt(settings, newValue);
         ThemeHelper.saveThemeMode((AppCompatActivity) mView.getActivity(), newValue);
@@ -420,7 +422,7 @@ public void setInt(Settings settings, int newValue)
     AbstractBooleanSetting blackBackgrounds = new AbstractBooleanSetting()
     {
       @Override
-      public boolean isOverridden(Settings settings)
+      public boolean isOverridden(@NonNull Settings settings)
       {
         return BooleanSetting.MAIN_USE_BLACK_BACKGROUNDS.isOverridden(settings);
       }
@@ -432,20 +434,20 @@ public boolean isRuntimeEditable()
       }
 
       @Override
-      public boolean delete(Settings settings)
+      public boolean delete(@NonNull Settings settings)
       {
         ThemeHelper.deleteBackgroundSetting((AppCompatActivity) mView.getActivity());
         return BooleanSetting.MAIN_USE_BLACK_BACKGROUNDS.delete(settings);
       }
 
       @Override
-      public boolean getBoolean(Settings settings)
+      public boolean getBoolean(@NonNull Settings settings)
       {
         return BooleanSetting.MAIN_USE_BLACK_BACKGROUNDS.getBoolean(settings);
       }
 
       @Override
-      public void setBoolean(Settings settings, boolean newValue)
+      public void setBoolean(@NonNull Settings settings, boolean newValue)
       {
         BooleanSetting.MAIN_USE_BLACK_BACKGROUNDS.setBoolean(settings, newValue);
         ThemeHelper.saveBackgroundSetting((AppCompatActivity) mView.getActivity(), newValue);
@@ -465,7 +467,7 @@ private void addAudioSettings(ArrayList<SettingsItem> sl)
     AbstractIntSetting dspEmulationEngine = new AbstractIntSetting()
     {
       @Override
-      public int getInt(Settings settings)
+      public int getInt(@NonNull Settings settings)
       {
         if (BooleanSetting.MAIN_DSP_HLE.getBoolean(settings))
         {
@@ -479,7 +481,7 @@ public int getInt(Settings settings)
       }
 
       @Override
-      public void setInt(Settings settings, int newValue)
+      public void setInt(@NonNull Settings settings, int newValue)
       {
         switch (newValue)
         {
@@ -501,7 +503,7 @@ public void setInt(Settings settings, int newValue)
       }
 
       @Override
-      public boolean isOverridden(Settings settings)
+      public boolean isOverridden(@NonNull Settings settings)
       {
         return BooleanSetting.MAIN_DSP_HLE.isOverridden(settings) ||
                 BooleanSetting.MAIN_DSP_JIT.isOverridden(settings);
@@ -515,7 +517,7 @@ public boolean isRuntimeEditable()
       }
 
       @Override
-      public boolean delete(Settings settings)
+      public boolean delete(@NonNull Settings settings)
       {
         // Not short circuiting
         return BooleanSetting.MAIN_DSP_HLE.delete(settings) &
@@ -642,7 +644,7 @@ private void addAdvancedSettings(ArrayList<SettingsItem> sl)
     AbstractIntSetting synchronizeGpuThread = new AbstractIntSetting()
     {
       @Override
-      public int getInt(Settings settings)
+      public int getInt(@NonNull Settings settings)
       {
         if (BooleanSetting.MAIN_SYNC_GPU.getBoolean(settings))
         {
@@ -656,7 +658,7 @@ public int getInt(Settings settings)
       }
 
       @Override
-      public void setInt(Settings settings, int newValue)
+      public void setInt(@NonNull Settings settings, int newValue)
       {
         switch (newValue)
         {
@@ -678,7 +680,7 @@ public void setInt(Settings settings, int newValue)
       }
 
       @Override
-      public boolean isOverridden(Settings settings)
+      public boolean isOverridden(@NonNull Settings settings)
       {
         return BooleanSetting.MAIN_SYNC_ON_SKIP_IDLE.isOverridden(settings) ||
                 BooleanSetting.MAIN_SYNC_GPU.isOverridden(settings);
@@ -692,7 +694,7 @@ public boolean isRuntimeEditable()
       }
 
       @Override
-      public boolean delete(Settings settings)
+      public boolean delete(@NonNull Settings settings)
       {
         // Not short circuiting
         return BooleanSetting.MAIN_SYNC_ON_SKIP_IDLE.delete(settings) &
@@ -737,78 +739,15 @@ else if (defaultCpuCore == 4)  // AArch64
     sl.add(new PercentSliderSetting(mContext, FloatSetting.MAIN_OVERCLOCK, R.string.overclock_title,
             R.string.overclock_title_description, 0, 400, "%", 1));
 
-    AbstractIntSetting mem1Setting = new AbstractIntSetting()
-    {
-      @Override
-      public int getInt(Settings settings)
-      {
-        return IntSetting.MAIN_MEM1_SIZE.getInt(settings) / 1024 / 1024;
-      }
-
-      @Override
-      public void setInt(Settings settings, int newValue)
-      {
-        IntSetting.MAIN_MEM1_SIZE.setInt(settings, newValue * 1024 * 1024);
-      }
-
-      @Override
-      public boolean isOverridden(Settings settings)
-      {
-        return IntSetting.MAIN_MEM1_SIZE.isOverridden(settings);
-      }
-
-      @Override
-      public boolean isRuntimeEditable()
-      {
-        return IntSetting.MAIN_MEM1_SIZE.isRuntimeEditable();
-      }
+    ScaledIntSetting mem1Size = new ScaledIntSetting(1024 * 1024, IntSetting.MAIN_MEM1_SIZE);
+    ScaledIntSetting mem2Size = new ScaledIntSetting(1024 * 1024, IntSetting.MAIN_MEM2_SIZE);
 
-      @Override
-      public boolean delete(Settings settings)
-      {
-        return IntSetting.MAIN_MEM1_SIZE.delete(settings);
-      }
-    };
-    AbstractIntSetting mem2Setting = new AbstractIntSetting()
-    {
-      @Override
-      public int getInt(Settings settings)
-      {
-        return IntSetting.MAIN_MEM2_SIZE.getInt(settings) / 1024 / 1024;
-      }
-
-      @Override
-      public void setInt(Settings settings, int newValue)
-      {
-        IntSetting.MAIN_MEM2_SIZE.setInt(settings, newValue * 1024 * 1024);
-      }
-
-      @Override
-      public boolean isOverridden(Settings settings)
-      {
-        return IntSetting.MAIN_MEM2_SIZE.isOverridden(settings);
-      }
-
-      @Override
-      public boolean isRuntimeEditable()
-      {
-        return IntSetting.MAIN_MEM2_SIZE.isRuntimeEditable();
-      }
-
-      @Override
-      public boolean delete(Settings settings)
-      {
-        return IntSetting.MAIN_MEM2_SIZE.delete(settings);
-      }
-    };
     sl.add(new HeaderSetting(mContext, R.string.memory_override, 0));
     sl.add(new SwitchSetting(mContext, BooleanSetting.MAIN_RAM_OVERRIDE_ENABLE,
             R.string.enable_memory_size_override,
             R.string.enable_memory_size_override_description));
-    sl.add(new IntSliderSetting(mContext, mem1Setting, R.string.main_mem1_size, 0, 24, 64, "MB",
-            1));
-    sl.add(new IntSliderSetting(mContext, mem2Setting, R.string.main_mem2_size, 0, 64, 128, "MB",
-            1));
+    sl.add(new IntSliderSetting(mContext, mem1Size, R.string.main_mem1_size, 0, 24, 64, "MB", 1));
+    sl.add(new IntSliderSetting(mContext, mem2Size, R.string.main_mem2_size, 0, 64, 128, "MB", 1));
 
     sl.add(new HeaderSetting(mContext, R.string.gpu_options, 0));
     sl.add(new SingleChoiceSetting(mContext, synchronizeGpuThread, R.string.synchronize_gpu_thread,