diff --git a/Source/Android/app/src/main/res/layout/list_item_header.xml b/Source/Android/app/src/main/res/layout/list_item_header.xml
index ba349cebcf..94f97d99e5 100644
--- a/Source/Android/app/src/main/res/layout/list_item_header.xml
+++ b/Source/Android/app/src/main/res/layout/list_item_header.xml
@@ -10,12 +10,15 @@
         android:id="@+id/text_header_name"
         android:layout_width="wrap_content"
         android:layout_height="46dp"
-        android:gravity="bottom"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         android:layout_marginStart="@dimen/spacing_large"
         android:layout_marginBottom="2dp"
+        android:gravity="start|bottom"
         android:textColor="?attr/colorPrimary"
         android:textStyle="bold"
+        android:textAlignment="viewStart"
         tools:text="CPU Settings" />
 
 </RelativeLayout>
diff --git a/Source/Android/app/src/main/res/layout/list_item_setting.xml b/Source/Android/app/src/main/res/layout/list_item_setting.xml
index 439a918f9e..11d30534ce 100644
--- a/Source/Android/app/src/main/res/layout/list_item_setting.xml
+++ b/Source/Android/app/src/main/res/layout/list_item_setting.xml
@@ -4,37 +4,39 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="72dp"
     android:background="?android:attr/selectableItemBackground"
+    android:clickable="true"
     android:focusable="true"
-    android:clickable="true">
+    android:minHeight="72dp">
 
     <TextView
+        android:id="@+id/text_setting_name"
+        style="@style/TextAppearance.MaterialComponents.Headline5"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        style="@style/TextAppearance.MaterialComponents.Headline5"
-        tools:text="Setting Name"
         android:layout_alignParentEnd="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
-        android:layout_marginStart="@dimen/spacing_large"
         android:layout_marginEnd="@dimen/spacing_large"
+        android:layout_marginStart="@dimen/spacing_large"
         android:layout_marginTop="@dimen/spacing_large"
-        android:id="@+id/text_setting_name"
-        android:textSize="16sp"/>
+        android:textSize="16sp"
+        android:textAlignment="viewStart"
+        tools:text="Setting Name" />
 
     <TextView
+        android:id="@+id/text_setting_description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        tools:text="@string/overclock_enable_description"
         android:layout_alignParentEnd="true"
         android:layout_alignParentStart="true"
-        android:layout_marginStart="@dimen/spacing_large"
-        android:layout_marginEnd="@dimen/spacing_large"
-        android:layout_marginBottom="@dimen/spacing_large"
-        android:layout_marginTop="@dimen/spacing_small"
-        android:id="@+id/text_setting_description"
+        android:layout_alignStart="@+id/text_setting_name"
         android:layout_below="@+id/text_setting_name"
-        android:layout_alignStart="@+id/text_setting_name"/>
+        android:layout_marginBottom="@dimen/spacing_large"
+        android:layout_marginEnd="@dimen/spacing_large"
+        android:layout_marginStart="@dimen/spacing_large"
+        android:layout_marginTop="@dimen/spacing_small"
+        android:textAlignment="viewStart"
+        tools:text="@string/overclock_enable_description" />
 
 </RelativeLayout>
diff --git a/Source/Android/app/src/main/res/layout/list_item_setting_switch.xml b/Source/Android/app/src/main/res/layout/list_item_setting_switch.xml
index 9613a7337f..06c3d30840 100644
--- a/Source/Android/app/src/main/res/layout/list_item_setting_switch.xml
+++ b/Source/Android/app/src/main/res/layout/list_item_setting_switch.xml
@@ -21,6 +21,7 @@
         android:layout_marginTop="@dimen/spacing_large"
         android:layout_toStartOf="@+id/setting_switch"
         android:textSize="16sp"
+        android:textAlignment="viewStart"
         tools:text="@string/overclock_enable"/>
 
     <TextView
@@ -35,6 +36,7 @@
         android:layout_marginStart="@dimen/spacing_large"
         android:layout_marginTop="@dimen/spacing_small"
         android:layout_toStartOf="@+id/setting_switch"
+        android:textAlignment="viewStart"
         tools:text="@string/overclock_enable_description"/>
 
     <com.google.android.material.materialswitch.MaterialSwitch
diff --git a/Source/Android/app/src/main/res/layout/list_item_submenu.xml b/Source/Android/app/src/main/res/layout/list_item_submenu.xml
index 9a8e5dbc18..56b21e0f81 100644
--- a/Source/Android/app/src/main/res/layout/list_item_submenu.xml
+++ b/Source/Android/app/src/main/res/layout/list_item_submenu.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="54dp"
     android:background="?android:attr/selectableItemBackground"
+    android:clickable="true"
     android:focusable="true"
-    android:clickable="true">
+    android:minHeight="54dp">
 
     <TextView
+        android:id="@+id/text_setting_name"
+        style="@style/TextAppearance.MaterialComponents.Headline5"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        style="@style/TextAppearance.MaterialComponents.Headline5"
-        tools:text="Setting Name"
         android:layout_alignParentEnd="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
-        android:layout_marginStart="@dimen/spacing_large"
         android:layout_marginEnd="@dimen/spacing_large"
+        android:layout_marginStart="@dimen/spacing_large"
         android:layout_marginTop="@dimen/spacing_large"
-        android:id="@+id/text_setting_name"
-        android:textSize="16sp" />
+        android:textSize="16sp"
+        android:textAlignment="viewStart"
+        tools:text="Setting Name" />
 
 </RelativeLayout>