diff --git a/Source/Android/app/src/main/res/layout-land/activity_user_data.xml b/Source/Android/app/src/main/res/layout-land/activity_user_data.xml
index 9b141d96e8..df1f5c4cc2 100644
--- a/Source/Android/app/src/main/res/layout-land/activity_user_data.xml
+++ b/Source/Android/app/src/main/res/layout-land/activity_user_data.xml
@@ -50,6 +50,7 @@
                 android:id="@+id/text_type"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:textAlignment="viewStart"
                 app:layout_constraintBottom_toTopOf="@id/text_path"
                 app:layout_constraintWidth_max="400dp"
                 app:layout_constraintEnd_toStartOf="@id/divider"
@@ -62,6 +63,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
+                android:textAlignment="viewStart"
                 tools:text="/storage/emulated/0/Android/data/org.dolphinemu.dolphinemu/files"
                 app:layout_constraintWidth_max="400dp"
                 app:layout_constraintStart_toStartOf="parent"
@@ -75,6 +77,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
                 android:text="@string/user_data_new_location_android_11"
+                android:textAlignment="viewStart"
                 app:layout_constraintWidth_max="400dp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/divider"
diff --git a/Source/Android/app/src/main/res/layout-ldrtl/list_item_cheat.xml b/Source/Android/app/src/main/res/layout-ldrtl/list_item_cheat.xml
index 097032242c..36cdaccd03 100644
--- a/Source/Android/app/src/main/res/layout-ldrtl/list_item_cheat.xml
+++ b/Source/Android/app/src/main/res/layout-ldrtl/list_item_cheat.xml
@@ -21,7 +21,8 @@
         android:layout_marginEnd="@dimen/spacing_large"
         android:layout_marginStart="@dimen/spacing_large"
         android:layout_toStartOf="@+id/cheat_switch"
-        android:gravity="center_vertical|end"
+        android:gravity="center_vertical|start"
+        android:textAlignment="viewStart"
         android:textSize="16sp"
         tools:text="Hyrule Field Speed Hack" />
 
diff --git a/Source/Android/app/src/main/res/layout-w600dp/dialog_about.xml b/Source/Android/app/src/main/res/layout-w600dp/dialog_about.xml
index 03006aa7cc..fe33e4e6ca 100644
--- a/Source/Android/app/src/main/res/layout-w600dp/dialog_about.xml
+++ b/Source/Android/app/src/main/res/layout-w600dp/dialog_about.xml
@@ -56,48 +56,53 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/name_text"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/about_dolphin"
                         android:textAppearance="@style/TextAppearance.AppCompat.Display3"
-                        android:textColor="?attr/colorOnSurface" />
+                        android:textColor="?attr/colorOnSurface"
+                        android:textAlignment="viewStart" />
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/version_text"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/spacing_large"
                         android:textAppearance="@style/TextAppearance.AppCompat.Large"
                         android:textColor="?attr/colorOnSurface"
                         android:textIsSelectable="true"
+                        android:textAlignment="viewStart"
                         tools:text="5.0-XXXXX" />
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/branch_text"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/spacing_large"
                         android:textColor="?attr/colorOnSurface"
                         android:textIsSelectable="true"
+                        android:textAlignment="viewStart"
                         tools:text="Branch:\nmaster" />
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/revision_text"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/spacing_large"
                         android:textColor="?attr/colorOnSurface"
                         android:textIsSelectable="true"
+                        android:textAlignment="viewStart"
                         tools:text="Revision:\nf4f94396e94dad9cd4d7d7fb6defa096966a4ab8" />
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/about_dolphin_text"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/spacing_large"
                         android:focusable="false"
                         android:text="@string/about_dolphin_description"
-                        android:textColor="?attr/colorOnSurface" />
+                        android:textColor="?attr/colorOnSurface"
+                        android:textAlignment="viewStart" />
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
diff --git a/Source/Android/app/src/main/res/layout-w680dp-land/activity_convert.xml b/Source/Android/app/src/main/res/layout-w680dp-land/activity_convert.xml
index 9b4760b04b..e265ba986a 100644
--- a/Source/Android/app/src/main/res/layout-w680dp-land/activity_convert.xml
+++ b/Source/Android/app/src/main/res/layout-w680dp-land/activity_convert.xml
@@ -50,6 +50,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:text="@string/convert_format_info"
+                android:textAlignment="viewStart"
                 app:layout_constraintWidth_max="400dp"
                 app:layout_constraintHorizontal_bias="1.0"
                 app:layout_constraintTop_toTopOf="parent"
diff --git a/Source/Android/app/src/main/res/layout/activity_convert.xml b/Source/Android/app/src/main/res/layout/activity_convert.xml
index 66ac49594a..371c2fa8d7 100644
--- a/Source/Android/app/src/main/res/layout/activity_convert.xml
+++ b/Source/Android/app/src/main/res/layout/activity_convert.xml
@@ -71,6 +71,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="24dp"
                 android:text="@string/convert_format_info"
+                android:textAlignment="viewStart"
                 app:layout_constraintWidth_max="400dp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml b/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml
index 766bdaea7d..7afc4184e8 100644
--- a/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml
+++ b/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml
@@ -50,6 +50,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/spacing_large"
+                android:textAlignment="viewStart"
                 tools:text="@string/riivolution_sd_root"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/Source/Android/app/src/main/res/layout/activity_user_data.xml b/Source/Android/app/src/main/res/layout/activity_user_data.xml
index 8eae1fa4d9..7a256bd9e9 100644
--- a/Source/Android/app/src/main/res/layout/activity_user_data.xml
+++ b/Source/Android/app/src/main/res/layout/activity_user_data.xml
@@ -53,6 +53,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/spacing_medlarge"
+                android:textAlignment="viewStart"
                 app:layout_constraintBottom_toTopOf="@id/text_path"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -66,6 +67,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacing_medlarge"
                 android:layout_marginBottom="@dimen/spacing_medlarge"
+                android:textAlignment="viewStart"
                 tools:text="/storage/emulated/0/Android/data/org.dolphinemu.dolphinemu/files"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -79,6 +81,7 @@
                 android:layout_marginTop="@dimen/spacing_medlarge"
                 android:layout_marginBottom="@dimen/spacing_medlarge"
                 android:text="@string/user_data_new_location_android_11"
+                android:textAlignment="viewStart"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/text_path"
diff --git a/Source/Android/app/src/main/res/layout/card_game.xml b/Source/Android/app/src/main/res/layout/card_game.xml
index 47e2c7a559..07982647b4 100644
--- a/Source/Android/app/src/main/res/layout/card_game.xml
+++ b/Source/Android/app/src/main/res/layout/card_game.xml
@@ -54,6 +54,7 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:paddingTop="8dp"
+        android:textAlignment="viewStart"
         app:layout_constraintEnd_toEndOf="@+id/card_game_art"
         app:layout_constraintStart_toStartOf="@+id/card_game_art"
         app:layout_constraintTop_toBottomOf="@+id/card_game_art"
@@ -68,6 +69,7 @@
         android:lines="1"
         android:maxLines="1"
         android:paddingTop="8dp"
+        android:textAlignment="viewStart"
         app:layout_constraintEnd_toEndOf="@+id/card_game_art"
         app:layout_constraintStart_toStartOf="@+id/card_game_art"
         app:layout_constraintTop_toBottomOf="@+id/text_game_title"
diff --git a/Source/Android/app/src/main/res/layout/dialog_game_details.xml b/Source/Android/app/src/main/res/layout/dialog_game_details.xml
index 3f35eecb4d..57a8530134 100644
--- a/Source/Android/app/src/main/res/layout/dialog_game_details.xml
+++ b/Source/Android/app/src/main/res/layout/dialog_game_details.xml
@@ -16,29 +16,33 @@
         <TextView
             android:id="@+id/text_game_title"
             style="@android:style/TextAppearance.Material.Headline"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:ellipsize="end"
-            tools:text="Rhythm Heaven Fever"
+            android:textAlignment="viewStart"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Rhythm Heaven Fever" />
 
         <TextView
             android:id="@+id/text_description"
             style="@android:style/TextAppearance.Material.Caption"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            tools:text="Zany rhythm action!"
+            android:textAlignment="viewStart"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/text_game_title" />
+            app:layout_constraintTop_toBottomOf="@id/text_game_title"
+            tools:text="Zany rhythm action!" />
 
         <ImageView
             android:id="@+id/banner"
             android:layout_width="144dp"
             android:layout_height="48dp"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="20dp"
             android:layout_marginBottom="16dp"
             tools:src="@drawable/no_banner"
             app:layout_constraintStart_toStartOf="parent"
@@ -48,7 +52,7 @@
             android:id="@+id/divider_1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
+            android:layout_marginTop="24dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/banner" />
@@ -58,7 +62,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:gravity="start"
+            android:textAlignment="viewStart"
             android:text="@string/game_details_country"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/divider_1" />
@@ -68,7 +72,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:gravity="start"
+            android:textAlignment="viewStart"
             android:text="@string/game_details_company"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/label_country" />
@@ -78,7 +82,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:gravity="start"
+            android:textAlignment="viewStart"
             android:text="@string/game_details_game_id"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/label_company" />
@@ -88,67 +92,60 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:gravity="start"
+            android:textAlignment="viewStart"
             android:text="@string/game_details_revision"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/label_game_id" />
 
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/label_barrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="end"
-            app:constraint_referenced_ids="label_country,label_company,label_game_id,label_revision,label_file_format,label_compression,label_block_size" />
-
         <TextView
             android:id="@+id/text_country"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:gravity="end"
-            tools:text="United States"
-            app:layout_constraintStart_toEndOf="@id/label_barrier"
+            android:textAlignment="viewEnd"
+            android:layout_marginStart="@dimen/spacing_medlarge"
+            app:layout_constraintBaseline_toBaselineOf="@+id/label_country"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBaseline_toBaselineOf="@id/label_country" />
+            app:layout_constraintStart_toEndOf="@+id/label_country"
+            tools:text="United States" />
 
         <TextView
             android:id="@+id/text_company"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:gravity="end"
-            tools:text="Nintendo"
-            app:layout_constraintStart_toEndOf="@id/label_barrier"
+            android:textAlignment="viewEnd"
+            android:layout_marginStart="@dimen/spacing_medlarge"
+            app:layout_constraintBaseline_toBaselineOf="@+id/label_company"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBaseline_toBaselineOf="@id/label_company" />
+            app:layout_constraintStart_toEndOf="@+id/label_company"
+            tools:text="Nintendo" />
 
         <TextView
             android:id="@+id/text_game_id"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:gravity="end"
-            tools:text="SOME01"
-            app:layout_constraintStart_toEndOf="@id/label_barrier"
+            android:textAlignment="viewEnd"
+            android:layout_marginStart="@dimen/spacing_medlarge"
+            app:layout_constraintBaseline_toBaselineOf="@+id/label_game_id"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBaseline_toBaselineOf="@id/label_game_id" />
+            app:layout_constraintStart_toEndOf="@+id/label_game_id"
+            tools:text="SOME01" />
 
         <TextView
             android:id="@+id/text_revision"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:gravity="end"
-            tools:text="0"
-            app:layout_constraintStart_toEndOf="@id/label_barrier"
+            android:textAlignment="viewEnd"
+            android:layout_marginStart="@dimen/spacing_medlarge"
+            app:layout_constraintBaseline_toBaselineOf="@+id/label_revision"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBaseline_toBaselineOf="@id/label_revision" />
+            app:layout_constraintStart_toEndOf="@+id/label_revision"
+            tools:text="0" />
 
         <com.google.android.material.divider.MaterialDivider
             android:id="@+id/divider_2"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
+            android:layout_marginTop="24dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/label_revision" />
@@ -158,7 +155,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:gravity="start"
+            android:layout_marginEnd="@dimen/spacing_small"
+            android:textAlignment="viewStart"
             android:text="@string/game_details_file_format"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/divider_2" />
@@ -168,7 +166,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:gravity="start"
+            android:textAlignment="viewStart"
             android:text="@string/game_details_compression"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/label_file_format" />
@@ -178,7 +176,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:gravity="start"
+            android:textAlignment="viewStart"
             android:text="@string/game_details_block_size"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/label_compression" />
@@ -187,34 +185,34 @@
             android:id="@+id/text_file_format"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:gravity="end"
-            tools:text="ISO (4.38 GiB)"
-            app:layout_constraintStart_toEndOf="@id/label_barrier"
+            android:textAlignment="viewEnd"
+            android:layout_marginStart="@dimen/spacing_medlarge"
+            app:layout_constraintBaseline_toBaselineOf="@+id/label_file_format"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBaseline_toBaselineOf="@id/label_file_format" />
+            app:layout_constraintStart_toEndOf="@+id/label_file_format"
+            tools:text="ISO (4.38 GiB)" />
 
         <TextView
             android:id="@+id/text_compression"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:gravity="end"
-            tools:text="No Compression"
-            app:layout_constraintStart_toEndOf="@id/label_barrier"
+            android:textAlignment="viewEnd"
+            android:layout_marginStart="@dimen/spacing_medlarge"
+            app:layout_constraintBaseline_toBaselineOf="@+id/label_compression"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBaseline_toBaselineOf="@id/label_compression" />
+            app:layout_constraintStart_toEndOf="@+id/label_compression"
+            tools:text="No Compression" />
 
         <TextView
             android:id="@+id/text_block_size"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:gravity="end"
-            tools:text="0 B"
-            app:layout_constraintStart_toEndOf="@id/label_barrier"
+            android:textAlignment="viewEnd"
+            android:layout_marginStart="@dimen/spacing_medlarge"
+            app:layout_constraintBaseline_toBaselineOf="@+id/label_block_size"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBaseline_toBaselineOf="@id/label_block_size" />
+            app:layout_constraintStart_toEndOf="@+id/label_block_size"
+            tools:text="0 B" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/Source/Android/app/src/main/res/layout/dialog_game_details_tv.xml b/Source/Android/app/src/main/res/layout/dialog_game_details_tv.xml
index bc919c75e8..7146565357 100644
--- a/Source/Android/app/src/main/res/layout/dialog_game_details_tv.xml
+++ b/Source/Android/app/src/main/res/layout/dialog_game_details_tv.xml
@@ -16,33 +16,36 @@
         <TextView
             android:id="@+id/text_game_title"
             style="@android:style/TextAppearance.Material.Headline"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:ellipsize="end"
-            android:textColor="@android:color/black"
-            tools:text="Rhythm Heaven Fever"
+            android:textColor="@color/dolphin_onSurface"
+            android:textAlignment="viewStart"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Rhythm Heaven Fever" />
 
         <TextView
             android:id="@+id/text_description"
             style="@android:style/TextAppearance.Material.Caption"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:textColor="@android:color/black"
-            tools:text="Zany rhythm action!"
+            android:textColor="@color/dolphin_onSurface"
+            android:textAlignment="viewStart"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/text_game_title" />
+            app:layout_constraintTop_toBottomOf="@id/text_game_title"
+            tools:text="Zany rhythm action!" />
 
         <ImageView
             android:id="@+id/banner"
             android:layout_width="144dp"
             android:layout_height="48dp"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="20dp"
             android:layout_marginBottom="16dp"
-            android:textColor="@android:color/black"
             tools:src="@drawable/no_banner"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/text_description" />
@@ -51,8 +54,8 @@
             android:id="@+id/divider_1"
             android:layout_width="0dp"
             android:layout_height="1dp"
-            android:layout_marginTop="32dp"
-            android:background="#1F000000"
+            android:layout_marginTop="24dp"
+            android:background="@color/dolphin_onSurfaceVariant"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/banner" />
@@ -62,9 +65,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:gravity="start"
+            android:textAlignment="viewStart"
             android:text="@string/game_details_country"
-            android:textColor="@android:color/black"
+            android:textColor="@color/dolphin_onSurface"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/divider_1" />
 
@@ -73,9 +76,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:gravity="start"
+            android:textAlignment="viewStart"
             android:text="@string/game_details_company"
-            android:textColor="@android:color/black"
+            android:textColor="@color/dolphin_onSurface"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/label_country" />
 
@@ -84,9 +87,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:gravity="start"
+            android:textAlignment="viewStart"
             android:text="@string/game_details_game_id"
-            android:textColor="@android:color/black"
+            android:textColor="@color/dolphin_onSurface"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/label_company" />
 
@@ -95,73 +98,66 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:gravity="start"
+            android:textAlignment="viewStart"
             android:text="@string/game_details_revision"
-            android:textColor="@android:color/black"
+            android:textColor="@color/dolphin_onSurface"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/label_game_id" />
 
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/label_barrier"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="end"
-            app:constraint_referenced_ids="label_country,label_company,label_game_id,label_revision,label_file_format,label_compression,label_block_size" />
-
         <TextView
             android:id="@+id/text_country"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:gravity="end"
-            android:textColor="@android:color/black"
-            tools:text="United States"
-            app:layout_constraintStart_toEndOf="@id/label_barrier"
+            android:textAlignment="viewEnd"
+            android:textColor="@color/dolphin_onSurface"
+            android:layout_marginStart="@dimen/spacing_medlarge"
+            app:layout_constraintBaseline_toBaselineOf="@+id/label_country"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBaseline_toBaselineOf="@id/label_country" />
+            app:layout_constraintStart_toEndOf="@+id/label_country"
+            tools:text="United States" />
 
         <TextView
             android:id="@+id/text_company"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:gravity="end"
-            android:textColor="@android:color/black"
-            tools:text="Nintendo"
-            app:layout_constraintStart_toEndOf="@id/label_barrier"
+            android:textAlignment="viewEnd"
+            android:textColor="@color/dolphin_onSurface"
+            android:layout_marginStart="@dimen/spacing_medlarge"
+            app:layout_constraintBaseline_toBaselineOf="@+id/label_company"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBaseline_toBaselineOf="@id/label_company" />
+            app:layout_constraintStart_toEndOf="@+id/label_company"
+            tools:text="Nintendo" />
 
         <TextView
             android:id="@+id/text_game_id"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:gravity="end"
-            android:textColor="@android:color/black"
-            tools:text="SOME01"
-            app:layout_constraintStart_toEndOf="@id/label_barrier"
+            android:textAlignment="viewEnd"
+            android:textColor="@color/dolphin_onSurface"
+            android:layout_marginStart="@dimen/spacing_medlarge"
+            app:layout_constraintBaseline_toBaselineOf="@+id/label_game_id"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBaseline_toBaselineOf="@id/label_game_id" />
+            app:layout_constraintStart_toEndOf="@+id/label_game_id"
+            tools:text="SOME01" />
 
         <TextView
             android:id="@+id/text_revision"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:gravity="end"
-            android:textColor="@android:color/black"
-            tools:text="0"
-            app:layout_constraintStart_toEndOf="@id/label_barrier"
+            android:textAlignment="viewEnd"
+            android:textColor="@color/dolphin_onSurface"
+            android:layout_marginStart="@dimen/spacing_medlarge"
+            app:layout_constraintBaseline_toBaselineOf="@+id/label_revision"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBaseline_toBaselineOf="@id/label_revision" />
+            app:layout_constraintStart_toEndOf="@+id/label_revision"
+            tools:text="0" />
 
         <View
             android:id="@+id/divider_2"
             android:layout_width="0dp"
             android:layout_height="1dp"
-            android:layout_marginTop="32dp"
-            android:background="#1F000000"
+            android:layout_marginTop="24dp"
+            android:background="@color/dolphin_onSurfaceVariant"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/label_revision" />
@@ -171,9 +167,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:gravity="start"
+            android:layout_marginEnd="@dimen/spacing_small"
+            android:textAlignment="viewStart"
             android:text="@string/game_details_file_format"
-            android:textColor="@android:color/black"
+            android:textColor="@color/dolphin_onSurface"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/divider_2" />
 
@@ -182,9 +179,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:gravity="start"
+            android:textAlignment="viewStart"
             android:text="@string/game_details_compression"
-            android:textColor="@android:color/black"
+            android:textColor="@color/dolphin_onSurface"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/label_file_format" />
 
@@ -193,9 +190,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
-            android:gravity="start"
+            android:textAlignment="viewStart"
             android:text="@string/game_details_block_size"
-            android:textColor="@android:color/black"
+            android:textColor="@color/dolphin_onSurface"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/label_compression" />
 
@@ -203,37 +200,37 @@
             android:id="@+id/text_file_format"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:gravity="end"
-            android:textColor="@android:color/black"
-            tools:text="ISO (4.38 GiB)"
-            app:layout_constraintStart_toEndOf="@id/label_barrier"
+            android:textAlignment="viewEnd"
+            android:textColor="@color/dolphin_onSurface"
+            android:layout_marginStart="@dimen/spacing_medlarge"
+            app:layout_constraintBaseline_toBaselineOf="@+id/label_file_format"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBaseline_toBaselineOf="@id/label_file_format" />
+            app:layout_constraintStart_toEndOf="@+id/label_file_format"
+            tools:text="ISO (4.38 GiB)" />
 
         <TextView
             android:id="@+id/text_compression"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:gravity="end"
-            android:textColor="@android:color/black"
-            tools:text="No Compression"
-            app:layout_constraintStart_toEndOf="@id/label_barrier"
+            android:textAlignment="viewEnd"
+            android:textColor="@color/dolphin_onSurface"
+            android:layout_marginStart="@dimen/spacing_medlarge"
+            app:layout_constraintBaseline_toBaselineOf="@+id/label_compression"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBaseline_toBaselineOf="@id/label_compression" />
+            app:layout_constraintStart_toEndOf="@+id/label_compression"
+            tools:text="No Compression" />
 
         <TextView
             android:id="@+id/text_block_size"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:gravity="end"
-            android:textColor="@android:color/black"
-            tools:text="0 B"
-            app:layout_constraintStart_toEndOf="@id/label_barrier"
+            android:textAlignment="viewEnd"
+            android:textColor="@color/dolphin_onSurface"
+            android:layout_marginStart="@dimen/spacing_medlarge"
+            app:layout_constraintBaseline_toBaselineOf="@+id/label_block_size"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBaseline_toBaselineOf="@id/label_block_size" />
+            app:layout_constraintStart_toEndOf="@+id/label_block_size"
+            tools:text="0 B" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/Source/Android/app/src/main/res/layout/dialog_input_adjust.xml b/Source/Android/app/src/main/res/layout/dialog_input_adjust.xml
index 7ef69cd7d4..9e7369ffc7 100644
--- a/Source/Android/app/src/main/res/layout/dialog_input_adjust.xml
+++ b/Source/Android/app/src/main/res/layout/dialog_input_adjust.xml
@@ -20,6 +20,7 @@
             android:layout_marginEnd="@dimen/spacing_medlarge"
             android:text="@string/emulation_control_scale"
             android:textSize="16sp"
+            android:textAlignment="viewStart"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/input_scale_slider"
             app:layout_constraintStart_toStartOf="parent"
@@ -61,6 +62,7 @@
             android:layout_marginEnd="@dimen/spacing_medlarge"
             android:text="@string/emulation_control_opacity"
             android:textSize="16sp"
+            android:textAlignment="viewStart"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/input_opacity_slider"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/Source/Android/app/src/main/res/layout/dialog_ir_sensitivity.xml b/Source/Android/app/src/main/res/layout/dialog_ir_sensitivity.xml
index a04a73fc9f..479b2addbd 100644
--- a/Source/Android/app/src/main/res/layout/dialog_ir_sensitivity.xml
+++ b/Source/Android/app/src/main/res/layout/dialog_ir_sensitivity.xml
@@ -36,9 +36,9 @@
             android:id="@+id/text_ir_yaw_units"
             android:layout_width="92dp"
             android:layout_height="wrap_content"
-            android:gravity="start"
             android:layout_marginStart="24dp"
             android:layout_marginEnd="@dimen/spacing_medlarge"
+            android:textAlignment="viewStart"
             app:layout_constraintBottom_toBottomOf="@+id/slider_yaw"
             app:layout_constraintEnd_toStartOf="@id/slider_yaw"
             app:layout_constraintStart_toStartOf="parent"
@@ -77,9 +77,9 @@
             android:id="@+id/text_ir_pitch_units"
             android:layout_width="92dp"
             android:layout_height="wrap_content"
-            android:gravity="start"
             android:layout_marginStart="24dp"
             android:layout_marginEnd="@dimen/spacing_medlarge"
+            android:textAlignment="viewStart"
             app:layout_constraintBottom_toBottomOf="@+id/slider_pitch"
             app:layout_constraintEnd_toStartOf="@id/slider_pitch"
             app:layout_constraintStart_toStartOf="parent"
@@ -118,9 +118,9 @@
             android:id="@+id/text_ir_vertical_offset_units"
             android:layout_width="92dp"
             android:layout_height="wrap_content"
-            android:gravity="start"
             android:layout_marginStart="24dp"
             android:layout_marginEnd="@dimen/spacing_medlarge"
+            android:textAlignment="viewStart"
             app:layout_constraintBottom_toBottomOf="@+id/slider_vertical_offset"
             app:layout_constraintEnd_toStartOf="@id/slider_vertical_offset"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/Source/Android/app/src/main/res/layout/fragment_cheat_details.xml b/Source/Android/app/src/main/res/layout/fragment_cheat_details.xml
index 5b85c3b5ab..d8fafdca5d 100644
--- a/Source/Android/app/src/main/res/layout/fragment_cheat_details.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_cheat_details.xml
@@ -24,24 +24,25 @@
                 android:id="@+id/edit_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/cheats_name"
-                android:paddingTop="@dimen/spacing_medlarge"
                 android:layout_marginHorizontal="@dimen/spacing_large"
                 android:layout_marginVertical="@dimen/spacing_small"
+                android:hint="@string/cheats_name"
+                android:paddingTop="@dimen/spacing_medlarge"
                 app:errorEnabled="true"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/edit_creator"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="parent"
-                app:layout_constraintBottom_toTopOf="@id/edit_creator">
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edit_name_input"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:minHeight="48dp"
                     android:importantForAutofill="no"
                     android:inputType="text"
-                    tools:text="Hyrule Field Speed Hack"/>
+                    android:minHeight="48dp"
+                    android:textAlignment="viewStart"
+                    tools:text="Hyrule Field Speed Hack" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -63,7 +64,8 @@
                     android:layout_height="wrap_content"
                     android:minHeight="48dp"
                     android:importantForAutofill="no"
-                    android:inputType="text"/>
+                    android:inputType="text"
+                    android:textAlignment="viewStart" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -85,7 +87,8 @@
                     android:layout_height="wrap_content"
                     android:minHeight="48dp"
                     android:importantForAutofill="no"
-                    android:inputType="textMultiLine" />
+                    android:inputType="textMultiLine"
+                    android:textAlignment="viewStart" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -107,10 +110,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:minHeight="108sp"
-                    android:gravity="start"
                     android:importantForAutofill="no"
                     android:inputType="textMultiLine"
                     android:typeface="monospace"
+                    android:gravity="start"
+                    android:textAlignment="viewStart"
                     tools:text="0x8003d63c:dword:0x60000000\n0x8003d658:dword:0x60000000" />
 
             </com.google.android.material.textfield.TextInputLayout>
diff --git a/Source/Android/app/src/main/res/layout/fragment_cheat_warning.xml b/Source/Android/app/src/main/res/layout/fragment_cheat_warning.xml
index 159274bdef..5cafff690a 100644
--- a/Source/Android/app/src/main/res/layout/fragment_cheat_warning.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_cheat_warning.xml
@@ -11,6 +11,7 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/spacing_large"
+        android:textAlignment="viewStart"
         tools:text="@string/cheats_disabled_warning"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/button_settings"
diff --git a/Source/Android/app/src/main/res/layout/fragment_convert.xml b/Source/Android/app/src/main/res/layout/fragment_convert.xml
index cba11a8082..de009fab83 100644
--- a/Source/Android/app/src/main/res/layout/fragment_convert.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_convert.xml
@@ -81,8 +81,9 @@
         android:layout_height="0dp"
         android:layout_marginStart="@dimen/spacing_small"
         android:layout_marginEnd="@dimen/spacing_large"
-        android:gravity="center_vertical"
+        android:gravity="start|center_vertical"
         android:text="@string/convert_remove_junk_data"
+        android:textAlignment="viewStart"
         app:layout_constraintBottom_toBottomOf="@id/switch_remove_junk_data"
         app:layout_constraintEnd_toStartOf="@+id/switch_remove_junk_data"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/Source/Android/app/src/main/res/layout/fragment_grid_options.xml b/Source/Android/app/src/main/res/layout/fragment_grid_options.xml
index 427de0110b..cbdeb453b3 100644
--- a/Source/Android/app/src/main/res/layout/fragment_grid_options.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_grid_options.xml
@@ -33,6 +33,7 @@
                 android:layout_marginEnd="24dp"
                 android:layout_marginStart="24dp"
                 android:text="@string/download_game_covers"
+                android:textAlignment="viewStart"
                 app:layout_constraintBottom_toBottomOf="@+id/switch_download_covers"
                 app:layout_constraintEnd_toStartOf="@+id/switch_download_covers"
                 app:layout_constraintStart_toStartOf="parent"
@@ -66,6 +67,7 @@
                 android:layout_marginEnd="24dp"
                 android:layout_marginStart="24dp"
                 android:text="@string/show_titles_in_game_list"
+                android:textAlignment="viewStart"
                 app:layout_constraintBottom_toBottomOf="@+id/switch_show_titles"
                 app:layout_constraintEnd_toStartOf="@+id/switch_show_titles"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/Source/Android/app/src/main/res/layout/fragment_grid_options_tv.xml b/Source/Android/app/src/main/res/layout/fragment_grid_options_tv.xml
index b3f4d407a0..dd81b2b4f1 100644
--- a/Source/Android/app/src/main/res/layout/fragment_grid_options_tv.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_grid_options_tv.xml
@@ -24,11 +24,14 @@
 
             <TextView
                 android:id="@+id/text_download_covers"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
+                android:layout_marginEnd="24dp"
                 android:text="@string/download_game_covers"
+                android:textAlignment="viewStart"
                 app:layout_constraintBottom_toBottomOf="@+id/switch_download_covers"
+                app:layout_constraintEnd_toStartOf="@+id/switch_download_covers"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/switch_download_covers" />
 
diff --git a/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml b/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml
index 8507372b92..df5a104cef 100644
--- a/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml
@@ -20,6 +20,7 @@
         android:maxLines="@integer/game_title_lines"
         android:textSize="20sp"
         android:textColor="?attr/colorOnSurface"
+        android:textAlignment="viewStart"
         tools:text="The Legend of Zelda: The Wind Waker" />
 
     <com.google.android.material.divider.MaterialDivider
diff --git a/Source/Android/app/src/main/res/layout/list_item_cheat.xml b/Source/Android/app/src/main/res/layout/list_item_cheat.xml
index 257a305dd2..0c76b2339c 100644
--- a/Source/Android/app/src/main/res/layout/list_item_cheat.xml
+++ b/Source/Android/app/src/main/res/layout/list_item_cheat.xml
@@ -22,6 +22,7 @@
         android:layout_toStartOf="@id/cheat_switch"
         android:gravity="center_vertical|start"
         android:textSize="16sp"
+        android:textAlignment="viewStart"
         tools:text="Hyrule Field Speed Hack" />
 
     <com.google.android.material.materialswitch.MaterialSwitch
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>
diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml
index e9753d0e83..df5665b0e4 100644
--- a/Source/Android/app/src/main/res/values/styles.xml
+++ b/Source/Android/app/src/main/res/values/styles.xml
@@ -7,7 +7,8 @@
         <item name="android:textColor">?attr/colorOnSurface</item>
         <item name="android:textSize">16sp</item>
         <item name="android:fontFamily">sans-serif-condensed</item>
-        <item name="android:gravity">center_vertical|left</item>
+        <item name="android:gravity">center_vertical|start</item>
+        <item name="android:textAlignment">viewStart</item>
         <item name="android:paddingLeft">32dp</item>
         <item name="android:paddingRight">32dp</item>
     </style>