diff --git a/src/android/app/src/main/java/org/citra/citra_android/activities/EmulationActivity.java b/src/android/app/src/main/java/org/citra/citra_android/activities/EmulationActivity.java
index bc90b15c8..0ec722b46 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/activities/EmulationActivity.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/activities/EmulationActivity.java
@@ -496,7 +496,7 @@ public final class EmulationActivity extends AppCompatActivity {
             switch (i) {
                 case 6: // ZL
                 case 7: // ZR
-                case 13: // C-stick
+                case 12: // C-stick
                     defaultValue = false;
                     break;
             }
diff --git a/src/android/app/src/main/java/org/citra/citra_android/overlay/InputOverlay.java b/src/android/app/src/main/java/org/citra/citra_android/overlay/InputOverlay.java
index 891e38859..56fa6dc69 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/overlay/InputOverlay.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/overlay/InputOverlay.java
@@ -630,22 +630,18 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener {
                     R.drawable.button_select_pressed, ButtonType.BUTTON_SELECT, orientation));
         }
         if (mPreferences.getBoolean("buttonToggle10", true)) {
-            overlayButtons.add(initializeOverlayButton(getContext(), R.drawable.button_home,
-                    R.drawable.button_home_pressed, ButtonType.BUTTON_HOME, orientation));
-        }
-        if (mPreferences.getBoolean("buttonToggle11", true)) {
             overlayDpads.add(initializeOverlayDpad(getContext(), R.drawable.dpad,
                     R.drawable.dpad_pressed_one_direction,
                     R.drawable.dpad_pressed_two_directions,
                     ButtonType.DPAD_UP, ButtonType.DPAD_DOWN,
                     ButtonType.DPAD_LEFT, ButtonType.DPAD_RIGHT, orientation));
         }
-        if (mPreferences.getBoolean("buttonToggle12", true)) {
+        if (mPreferences.getBoolean("buttonToggle11", true)) {
             overlayJoysticks.add(initializeOverlayJoystick(getContext(), R.drawable.stick_main_range,
                     R.drawable.stick_main, R.drawable.stick_main_pressed,
                     ButtonType.STICK_LEFT, orientation));
         }
-        if (mPreferences.getBoolean("buttonToggle13", false)) {
+        if (mPreferences.getBoolean("buttonToggle12", false)) {
             overlayJoysticks.add(initializeOverlayJoystick(getContext(), R.drawable.stick_c_range,
                     R.drawable.stick_c, R.drawable.stick_c_pressed, ButtonType.STICK_C, orientation));
         }
diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml
index 8486a137c..77e5626db 100644
--- a/src/android/app/src/main/res/values/arrays.xml
+++ b/src/android/app/src/main/res/values/arrays.xml
@@ -61,7 +61,6 @@
         <item>ZR</item>
         <item>Start</item>
         <item>Select</item>
-        <item>Home</item>
         <item>D-Pad</item>
         <item>Circle Pad</item>
         <item>C Stick</item>
diff --git a/src/android/app/src/main/res/values/integers.xml b/src/android/app/src/main/res/values/integers.xml
index 7fcc79ba3..293b320d6 100644
--- a/src/android/app/src/main/res/values/integers.xml
+++ b/src/android/app/src/main/res/values/integers.xml
@@ -25,9 +25,9 @@
     <integer name="N3DS_STICK_C_Y">770</integer>
     <integer name="N3DS_STICK_MAIN_X">100</integer>
     <integer name="N3DS_STICK_MAIN_Y">670</integer>
-    <integer name="N3DS_BUTTON_START_X">510</integer>
+    <integer name="N3DS_BUTTON_START_X">470</integer>
     <integer name="N3DS_BUTTON_START_Y">850</integer>
-    <integer name="N3DS_BUTTON_SELECT_X">570</integer>
+    <integer name="N3DS_BUTTON_SELECT_X">550</integer>
     <integer name="N3DS_BUTTON_SELECT_Y">850</integer>
     <integer name="N3DS_BUTTON_HOME_X">450</integer>
     <integer name="N3DS_BUTTON_HOME_Y">850</integer>
@@ -57,9 +57,9 @@
     <integer name="N3DS_STICK_MAIN_PORTRAIT_Y">840</integer>
     <integer name="N3DS_BUTTON_HOME_PORTRAIT_X">360</integer>
     <integer name="N3DS_BUTTON_HOME_PORTRAIT_Y">794</integer>
-    <integer name="N3DS_BUTTON_START_PORTRAIT_X">460</integer>
+    <integer name="N3DS_BUTTON_START_PORTRAIT_X">400</integer>
     <integer name="N3DS_BUTTON_START_PORTRAIT_Y">794</integer>
-    <integer name="N3DS_BUTTON_SELECT_PORTRAIT_X">560</integer>
+    <integer name="N3DS_BUTTON_SELECT_PORTRAIT_X">520</integer>
     <integer name="N3DS_BUTTON_SELECT_PORTRAIT_Y">794</integer>
 
 </resources>