diff --git a/app/src/main/res/layout-land/fragment_compact_playback.xml b/app/src/main/res/layout-land/fragment_compact_playback.xml
index d52ee5050..be2383c04 100644
--- a/app/src/main/res/layout-land/fragment_compact_playback.xml
+++ b/app/src/main/res/layout-land/fragment_compact_playback.xml
@@ -49,6 +49,7 @@
             android:fontFamily="@font/inter_semibold"
             android:singleLine="true"
             android:text="@{song.name}"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.SmallHeader"
             app:layout_constraintBottom_toTopOf="@+id/playback_info"
             app:layout_constraintEnd_toStartOf="@+id/playback_controls"
@@ -65,6 +66,7 @@
             android:layout_marginEnd="@dimen/margin_mid_small"
             android:ellipsize="end"
             android:singleLine="true"
+            android:textAlignment="viewStart"
             android:text="@{@string/format_info(song.album.artist.name, song.album.name)}"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
             app:layout_constraintBottom_toBottomOf="@+id/playback_cover"
diff --git a/app/src/main/res/layout-land/fragment_playback.xml b/app/src/main/res/layout-land/fragment_playback.xml
index 0cb801fb7..93ebc3d31 100644
--- a/app/src/main/res/layout-land/fragment_playback.xml
+++ b/app/src/main/res/layout-land/fragment_playback.xml
@@ -70,6 +70,7 @@
                 android:id="@+id/playback_song"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:textAlignment="viewStart"
                 android:ellipsize="marquee"
                 android:fontFamily="@font/inter_semibold"
                 android:marqueeRepeatLimit="marquee_forever"
@@ -90,6 +91,7 @@
             android:ellipsize="end"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album.artist)}"
             android:singleLine="true"
+            android:textAlignment="viewStart"
             android:text="@{song.album.artist.name}"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
             android:textColor="?android:attr/textColorSecondary"
@@ -106,6 +108,7 @@
             android:layout_marginStart="@dimen/margin_mid_large"
             android:layout_marginEnd="@dimen/margin_mid_large"
             android:ellipsize="end"
+            android:textAlignment="viewStart"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album)}"
             android:singleLine="true"
             android:text="@{song.album.name}"
diff --git a/app/src/main/res/layout-large-land/fragment_playback.xml b/app/src/main/res/layout-large-land/fragment_playback.xml
index 4206ac9ed..7e0ce23e7 100644
--- a/app/src/main/res/layout-large-land/fragment_playback.xml
+++ b/app/src/main/res/layout-large-land/fragment_playback.xml
@@ -73,6 +73,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:ellipsize="marquee"
+                android:textAlignment="viewStart"
                 android:fontFamily="@font/inter_semibold"
                 android:marqueeRepeatLimit="marquee_forever"
                 android:onClick="@{() -> detailModel.navToItem(playbackModel.song)}"
@@ -90,6 +91,7 @@
             android:layout_marginStart="@dimen/margin_mid_large"
             android:layout_marginEnd="@dimen/margin_mid_large"
             android:ellipsize="end"
+            android:textAlignment="viewStart"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album.artist)}"
             android:singleLine="true"
             android:text="@{song.album.artist.name}"
@@ -108,6 +110,7 @@
             android:layout_marginStart="@dimen/margin_mid_large"
             android:layout_marginEnd="@dimen/margin_mid_large"
             android:ellipsize="end"
+            android:textAlignment="viewStart"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album)}"
             android:singleLine="true"
             android:text="@{song.album.name}"
diff --git a/app/src/main/res/layout-large-port/item_album_header.xml b/app/src/main/res/layout-large-port/item_album_header.xml
index aa0a09cab..7ada8ac50 100644
--- a/app/src/main/res/layout-large-port/item_album_header.xml
+++ b/app/src/main/res/layout-large-port/item_album_header.xml
@@ -119,7 +119,7 @@
             android:contentDescription="@string/description_sort_button"
             android:onClick="@{() -> detailModel.incrementAlbumSortMode()}"
             app:layout_constraintBottom_toBottomOf="@+id/album_song_header"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/album_song_header"
             app:layout_constraintTop_toTopOf="@+id/album_song_header"
             app:sortIcon="@{detailModel.albumSortMode}"
             tools:src="@drawable/ic_sort_numeric_down" />
diff --git a/app/src/main/res/layout/fragment_compact_playback.xml b/app/src/main/res/layout/fragment_compact_playback.xml
index 9e166f6ed..c2a77e924 100644
--- a/app/src/main/res/layout/fragment_compact_playback.xml
+++ b/app/src/main/res/layout/fragment_compact_playback.xml
@@ -59,6 +59,7 @@
             android:singleLine="true"
             android:text="@{song.name}"
             android:textAppearance="@style/TextAppearance.SmallHeader"
+            android:textAlignment="viewStart"
             app:layout_constraintBottom_toTopOf="@+id/playback_info"
             app:layout_constraintEnd_toStartOf="@+id/playback_controls"
             app:layout_constraintStart_toEndOf="@+id/playback_cover"
@@ -74,6 +75,7 @@
             android:layout_marginEnd="@dimen/margin_mid_small"
             android:ellipsize="end"
             android:singleLine="true"
+            android:textAlignment="viewStart"
             android:text="@{@string/format_info(song.album.artist.name, song.album.name)}"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fragment_playback.xml b/app/src/main/res/layout/fragment_playback.xml
index baf19afcc..e7c38f0b5 100644
--- a/app/src/main/res/layout/fragment_playback.xml
+++ b/app/src/main/res/layout/fragment_playback.xml
@@ -65,6 +65,7 @@
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song)}"
             android:singleLine="true"
             android:text="@{song.name}"
+            android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
             app:layout_constraintBottom_toTopOf="@+id/playback_artist"
             app:layout_constraintEnd_toEndOf="parent"
@@ -81,6 +82,7 @@
             android:ellipsize="end"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album.artist)}"
             android:singleLine="true"
+            android:textAlignment="viewStart"
             android:text="@{song.album.artist.name}"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
             android:textColor="?android:attr/textColorSecondary"
@@ -97,6 +99,7 @@
             android:layout_marginEnd="@dimen/margin_mid_large"
             android:layout_marginBottom="@dimen/margin_medium"
             android:ellipsize="end"
+            android:textAlignment="viewStart"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album)}"
             android:singleLine="true"
             android:text="@{song.album.name}"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7aecc4bf6..ce1daa343 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <string name="label_grant">Accorder</string>
     <string name="label_retry">Réessayer</string>
     <string name="label_library">Bibliothèque</string>
@@ -52,7 +51,7 @@
     <string name="color_label_blue">Bleu</string>
     <string name="color_label_light_blue">Bleu Clair</string>
     <string name="color_label_green">Vert</string>
-    <string name="color_label_light_green">"Vert Clair "</string>
+    <string name="color_label_light_green">Vert Clair</string>
     <string name="color_label_lime">Vert Citron</string>
     <string name="color_label_yellow">Jaune</string>
     <string name="color_label_amber">Ambre</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cdf1c3605..baef13368 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -63,6 +63,7 @@
         <item name="android:textSize">@dimen/text_size_detail_header_max</item>
         <item name="android:maxLines">1</item>
         <item name="android:ellipsize">end</item>
+        <item name="android:textAlignment">viewStart</item>
 
         <item name="autoSizeMaxTextSize">@dimen/text_size_detail_header_max</item>
         <item name="autoSizeMinTextSize">@dimen/text_size_min</item>
@@ -125,6 +126,7 @@
 
     <!-- Base style for any item text -->
     <style name="ItemText">
+        <item name="android:textAlignment">viewStart</item>
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:ellipsize">end</item>
@@ -156,6 +158,7 @@
         <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:fontFamily">@font/inter_semibold</item>
         <item name="android:background">@drawable/ui_header_dividers</item>
+        <item name="android:textAlignment">viewStart</item>
     </style>
 
     <!-- Style for an action header -->