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 0fb87d44a3..d8c0f6354a 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
@@ -2,51 +2,51 @@
android:id="@+id/grid_state_slots"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:columnCount="3"
- android:rowCount="2"
+ android:columnCount="@integer/loadsave_state_columns"
+ android:rowCount="@integer/loadsave_state_rows"
android:layout_gravity="center"
android:background="#af000000">
-
\ No newline at end of file
+
diff --git a/Source/Android/app/src/main/res/values-w540dp/integers.xml b/Source/Android/app/src/main/res/values-w540dp/integers.xml
new file mode 100644
index 0000000000..40860e6906
--- /dev/null
+++ b/Source/Android/app/src/main/res/values-w540dp/integers.xml
@@ -0,0 +1,5 @@
+
+
+ 2
+ 3
+
diff --git a/Source/Android/app/src/main/res/values-w660dp/integers.xml b/Source/Android/app/src/main/res/values-w660dp/integers.xml
new file mode 100644
index 0000000000..e4941c458e
--- /dev/null
+++ b/Source/Android/app/src/main/res/values-w660dp/integers.xml
@@ -0,0 +1,5 @@
+
+
+ 3
+ 2
+
diff --git a/Source/Android/app/src/main/res/values/integers.xml b/Source/Android/app/src/main/res/values/integers.xml
index 1585d38ff4..bbaed0f47a 100644
--- a/Source/Android/app/src/main/res/values/integers.xml
+++ b/Source/Android/app/src/main/res/values/integers.xml
@@ -1,6 +1,8 @@
3
+ 1
+ 6
865