diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SaveStateFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SaveStateFragment.java
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java
@@ -22,6 +22,13 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
 	private static final String FRAGMENT_TAG = "settings";
 	private SettingsActivityPresenter mPresenter = new SettingsActivityPresenter(this);
 
+	public static void launch(Context context, String menuTag)
+	{
+		Intent settings = new Intent(context, SettingsActivity.class);
+		settings.putExtra(ARG_FILE_NAME, menuTag);
+		context.startActivity(settings);
+	}
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState)
 	{
@@ -173,13 +180,4 @@ private SettingsFragment getFragment()
 	{
 		return (SettingsFragment) getFragmentManager().findFragmentByTag(FRAGMENT_TAG);
 	}
-
-	public static void launch(Context context, String menuTag)
-	{
-		Intent settings = new Intent(context, SettingsActivity.class);
-
-		settings.putExtra(ARG_FILE_NAME, menuTag);
-
-		context.startActivity(settings);
-	}
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragment.java
@@ -30,6 +30,17 @@ public final class SettingsFragment extends Fragment implements SettingsFragment
 
 	private SettingsAdapter mAdapter;
 
+	public static Fragment newInstance(String menuTag)
+	{
+		SettingsFragment fragment = new SettingsFragment();
+
+		Bundle arguments = new Bundle();
+		arguments.putString(ARGUMENT_MENU_TAG, menuTag);
+
+		fragment.setArguments(arguments);
+		return fragment;
+	}
+
 	@Override
 	public void onAttach(Context context)
 	{
@@ -175,14 +186,4 @@ public void onExtensionSettingChanged(String key, int value)
 		mActivity.onExtensionSettingChanged(key, value);
 	}
 
-	public static Fragment newInstance(String menuTag)
-	{
-		SettingsFragment fragment = new SettingsFragment();
-
-		Bundle arguments = new Bundle();
-		arguments.putString(ARGUMENT_MENU_TAG, menuTag);
-
-		fragment.setArguments(arguments);
-		return fragment;
-	}
 }
diff --git a/...c/main/res/layout/fragment_state_load.xml → ...in/res/layout/fragment_saveload_state.xml b/...c/main/res/layout/fragment_state_load.xml → ...in/res/layout/fragment_saveload_state.xml
@@ -14,47 +14,47 @@
         android:layout_gravity="center">
 
         <Button
-            android:id="@+id/menu_emulation_load_1"
+            android:id="@+id/loadsave_state_button_1"
             android:layout_width="128dp"
             android:layout_height="128dp"
             android:text="@string/emulation_slot1"
             style="@style/OverlayInGameMenuOption"/>
 
         <Button
-            android:id="@+id/menu_emulation_load_2"
+            android:id="@+id/loadsave_state_button_2"
             android:layout_width="128dp"
             android:layout_height="128dp"
             android:text="@string/emulation_slot2"
             style="@style/OverlayInGameMenuOption"/>
 
         <Button
-            android:id="@+id/menu_emulation_load_3"
+            android:id="@+id/loadsave_state_button_3"
             android:layout_width="128dp"
             android:layout_height="128dp"
             android:text="@string/emulation_slot3"
             style="@style/OverlayInGameMenuOption"/>
 
         <Button
-            android:id="@+id/menu_emulation_load_4"
+            android:id="@+id/loadsave_state_button_4"
             android:layout_width="128dp"
             android:layout_height="128dp"
             android:text="@string/emulation_slot4"
             style="@style/OverlayInGameMenuOption"/>
 
         <Button
-            android:id="@+id/menu_emulation_load_5"
+            android:id="@+id/loadsave_state_button_5"
             android:layout_width="128dp"
             android:layout_height="128dp"
             android:text="@string/emulation_slot5"
             style="@style/OverlayInGameMenuOption"/>
 
         <Button
-            android:id="@+id/menu_emulation_load_6"
+            android:id="@+id/loadsave_state_button_6"
             android:layout_width="128dp"
             android:layout_height="128dp"
             android:text="@string/emulation_slot6"
             style="@style/OverlayInGameMenuOption"/>
 
     </GridLayout>
 
-</FrameLayout>
+</FrameLayout>
diff --git a/Source/Android/app/src/main/res/layout/fragment_state_save.xml b/Source/Android/app/src/main/res/layout/fragment_state_save.xml