diff --git a/Source/Android/app/src/main/res/layout-television/fragment_emulation.xml b/Source/Android/app/src/main/res/layout-television/fragment_emulation.xml
index 276f5ad133..27243e8411 100644
--- a/Source/Android/app/src/main/res/layout-television/fragment_emulation.xml
+++ b/Source/Android/app/src/main/res/layout-television/fragment_emulation.xml
@@ -1,15 +1,7 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:tools="http://schemas.android.com/tools"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             tools:context="org.dolphinemu.dolphinemu.fragments.EmulationFragment">
-
-    <!-- This is what everything is rendered to during emulation -->
-    <SurfaceView
-        android:id="@+id/surface_emulation"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:focusable="false"
-        android:focusableInTouchMode="false"/>
-
-</FrameLayout>
\ No newline at end of file
+<SurfaceView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/surface_emulation"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:focusable="false"
+    android:focusableInTouchMode="false"
+    />
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/fragment_saveload_state.xml b/Source/Android/app/src/main/res/layout/fragment_saveload_state.xml
index 64ba331553..56bb02f01d 100644
--- a/Source/Android/app/src/main/res/layout/fragment_saveload_state.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_saveload_state.xml
@@ -1,60 +1,52 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             android:background="#af000000"
-             android:orientation="vertical">
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/grid_state_slots"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:columnCount="3"
+    android:rowCount="2"
+    android:layout_gravity="center"
+    android:background="#af000000">
 
-    <GridLayout
-        android:id="@+id/grid_state_slots"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:columnCount="3"
-        android:rowCount="2"
-        android:layout_gravity="center">
+    <Button
+        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/loadsave_state_button_1"
-            android:layout_width="128dp"
-            android:layout_height="128dp"
-            android:text="@string/emulation_slot1"
-            style="@style/OverlayInGameMenuOption"/>
+    <Button
+        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/loadsave_state_button_2"
-            android:layout_width="128dp"
-            android:layout_height="128dp"
-            android:text="@string/emulation_slot2"
-            style="@style/OverlayInGameMenuOption"/>
+    <Button
+        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/loadsave_state_button_3"
-            android:layout_width="128dp"
-            android:layout_height="128dp"
-            android:text="@string/emulation_slot3"
-            style="@style/OverlayInGameMenuOption"/>
+    <Button
+        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/loadsave_state_button_4"
-            android:layout_width="128dp"
-            android:layout_height="128dp"
-            android:text="@string/emulation_slot4"
-            style="@style/OverlayInGameMenuOption"/>
+    <Button
+        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/loadsave_state_button_5"
-            android:layout_width="128dp"
-            android:layout_height="128dp"
-            android:text="@string/emulation_slot5"
-            style="@style/OverlayInGameMenuOption"/>
+    <Button
+        android:id="@+id/loadsave_state_button_6"
+        android:layout_width="128dp"
+        android:layout_height="128dp"
+        android:text="@string/emulation_slot6"
+        style="@style/OverlayInGameMenuOption"/>
 
-        <Button
-            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>
+</GridLayout>
\ No newline at end of file