diff --git a/Source/Android/app/src/androidTest/java/org/dolphinemu/dolphinemu/ApplicationTest.java b/Source/Android/app/src/androidTest/java/org/dolphinemu/dolphinemu/ApplicationTest.java
deleted file mode 100644
index cf1848ddd5..0000000000
--- a/Source/Android/app/src/androidTest/java/org/dolphinemu/dolphinemu/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.dolphinemu.dolphinemu;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java
index f23e4bbe78..4e128ece86 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java
@@ -262,6 +262,9 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
       SingleChoiceSetting scSetting = (SingleChoiceSetting) mClickedItem;
 
       int value = getValueForSingleChoiceSelection(scSetting, which);
+      if (scSetting.getSelectedValue() != value)
+        mView.onSettingChanged();
+
       MenuTag menuTag = scSetting.getMenuTag();
       if (menuTag != null)
       {
@@ -313,6 +316,9 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
     {
       StringSingleChoiceSetting scSetting = (StringSingleChoiceSetting) mClickedItem;
       String value = scSetting.getValueAt(which);
+      if (!scSetting.getSelectedValue().equals(value))
+        mView.onSettingChanged();
+
       StringSetting setting = scSetting.setSelectedValue(value);
       if (setting != null)
       {
@@ -324,6 +330,9 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
     else if (mClickedItem instanceof SliderSetting)
     {
       SliderSetting sliderSetting = (SliderSetting) mClickedItem;
+      if (sliderSetting.getSelectedValue() != mSeekbarProgress)
+        mView.onSettingChanged();
+
       if (sliderSetting.isPercentSetting() || sliderSetting.getSetting() instanceof FloatSetting)
       {
         float value;
@@ -355,7 +364,6 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
       closeDialog();
     }
 
-    mView.onSettingChanged();
     mClickedItem = null;
     mSeekbarProgress = -1;
   }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
index 3306d3043c..9ffbfe54d8 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
@@ -453,7 +453,7 @@ public final class SettingsFragmentPresenter
             R.string.internal_resolution, R.string.internal_resolution_description,
             R.array.internalResolutionEntries, R.array.internalResolutionValues, 1, resolution));
     sl.add(new SingleChoiceSetting(SettingsFile.KEY_FSAA, Settings.SECTION_GFX_SETTINGS,
-            R.string.FSAA, R.string.FSAA_description, R.array.FSAAEntries, R.array.FSAAValues, 0,
+            R.string.FSAA, R.string.FSAA_description, R.array.FSAAEntries, R.array.FSAAValues, 1,
             fsaa));
     sl.add(new SingleChoiceSetting(SettingsFile.KEY_ANISOTROPY, Settings.SECTION_GFX_ENHANCEMENTS,
             R.string.anisotropic_filtering, R.string.anisotropic_filtering_description,
@@ -530,7 +530,7 @@ public final class SettingsFragmentPresenter
       if (shaderFiles != null)
       {
         String[] result = new String[shaderFiles.length + 1];
-        result[0] = "Off";
+        result[0] = mView.getActivity().getString(R.string.off);
         for (int i = 0; i < shaderFiles.length; i++)
         {
           String name = shaderFiles[i].getName();
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java
index 73eb02dae7..08b5612617 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java
@@ -1,6 +1,7 @@
 package org.dolphinemu.dolphinemu.features.settings.utils;
 
 import android.support.annotation.NonNull;
+import android.text.TextUtils;
 
 import org.dolphinemu.dolphinemu.NativeLibrary;
 import org.dolphinemu.dolphinemu.features.settings.model.BooleanSetting;
@@ -715,9 +716,11 @@ public final class SettingsFile
     for (String key : sortedKeySet)
     {
       Setting setting = settings.get(key);
-      String settingString = settingAsString(setting);
-
-      writer.println(settingString);
+      String valueAsString = setting.getValueAsString();
+      if (!TextUtils.isEmpty(valueAsString))
+      {
+        writer.println(setting.getKey() + " = " + valueAsString);
+      }
     }
   }
 
@@ -726,11 +729,6 @@ public final class SettingsFile
     return "[" + section.getName() + "]";
   }
 
-  private static String settingAsString(Setting setting)
-  {
-    return setting.getKey() + " = " + setting.getValueAsString();
-  }
-
   private static String customWiimoteExtSettingAsString(Setting setting)
   {
     return setting.getKey().substring(0, setting.getKey().length() - 1) + " = " +
diff --git a/Source/Android/app/src/main/res/layout/fragment_settings.xml b/Source/Android/app/src/main/res/layout/fragment_settings.xml
index 36b41502dc..2525ad507c 100644
--- a/Source/Android/app/src/main/res/layout/fragment_settings.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_settings.xml
@@ -6,10 +6,7 @@
     <android.support.v7.widget.RecyclerView
         android:id="@+id/list_settings"
         android:background="@android:color/white"
-        android:elevation="@dimen/elevation_high"
-        android:layout_marginStart="@dimen/activity_horizontal_margin"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-</org.dolphinemu.dolphinemu.features.settings.ui.SettingsFrameLayout>
\ No newline at end of file
+</org.dolphinemu.dolphinemu.features.settings.ui.SettingsFrameLayout>
diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml
index 403e27b2b1..63ba97cc46 100644
--- a/Source/Android/app/src/main/res/values/arrays.xml
+++ b/Source/Android/app/src/main/res/values/arrays.xml
@@ -143,14 +143,16 @@
 
     <!-- FSAA Preference -->
     <string-array name="FSAAEntries" translatable="false">
-        <item>1x</item>
+        <item>Off</item>
         <item>2x</item>
         <item>4x</item>
+        <item>8x</item>
     </string-array>
     <integer-array name="FSAAValues" translatable="false">
-        <item>0</item>
         <item>1</item>
         <item>2</item>
+        <item>4</item>
+        <item>8</item>
     </integer-array>
 
     <!-- Anisotropic Filtering Preference -->
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index 89a5cee805..bfdbefeca1 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -248,6 +248,7 @@
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="ok">OK</string>
+    <string name="off">Off</string>
     <string name="cancel">Cancel</string>
     <string name="clear">Clear</string>
     <string name="disabled">Disabled</string>