diff --git a/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml b/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml
index 8709690e8..6ab135128 100755
--- a/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml
@@ -38,7 +38,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:ellipsize="end"
-        android:maxLines="1"
+        android:maxLines="2"
         android:paddingStart="24dp"
         android:paddingEnd="24dp"
         android:textAppearance="@style/TextViewHeadline5"
diff --git a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml
index 91ecd9b9e..6455e657a 100644
--- a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml
@@ -13,211 +13,211 @@
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/playback_controls"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_vertical"
-    android:orientation="vertical"
-    tools:ignore="MissingPrefix">
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/playback_controls"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:gravity="center_vertical"
+	android:orientation="vertical"
+	tools:ignore="MissingPrefix">
 
-    <RelativeLayout
-        android:id="@+id/progressContainer"
-        android:layout_width="match_parent"
-        android:layout_height="28dp"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+	<RelativeLayout
+		android:id="@+id/progressContainer"
+		android:layout_width="match_parent"
+		android:layout_height="28dp"
+		android:paddingStart="12dp"
+		android:paddingEnd="12dp"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.appcompat.widget.AppCompatSeekBar
-            android:id="@+id/progressSlider"
-            style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:layout_toLeftOf="@id/songTotalTime"
-            android:layout_toRightOf="@id/songCurrentProgress"
-            android:maxHeight="1.5dp"
-            android:progressDrawable="@drawable/color_progress_seek"
-            android:splitTrack="false"
-            tools:ignore="RtlHardcoded,UnusedAttribute"
-            tools:progress="20" />
+		<androidx.appcompat.widget.AppCompatSeekBar
+			android:id="@+id/progressSlider"
+			style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_centerInParent="true"
+			android:layout_toLeftOf="@id/songTotalTime"
+			android:layout_toRightOf="@id/songCurrentProgress"
+			android:maxHeight="1.5dp"
+			android:progressDrawable="@drawable/color_progress_seek"
+			android:splitTrack="false"
+			tools:ignore="RtlHardcoded,UnusedAttribute"
+			tools:progress="20" />
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/songTotalTime"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:gravity="center_vertical|right|end"
-            android:paddingRight="8dp"
-            android:singleLine="true"
-            android:textColor="?colorOnSecondary"
-            android:textSize="12sp"
-            tools:ignore="RtlHardcoded,RtlSymmetry"
-            tools:text="00:22" />
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/songTotalTime"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:layout_alignParentRight="true"
+			android:gravity="center_vertical|right|end"
+			android:paddingRight="8dp"
+			android:singleLine="true"
+			android:textColor="?colorOnSecondary"
+			android:textSize="12sp"
+			tools:ignore="RtlHardcoded,RtlSymmetry"
+			tools:text="00:22" />
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/songCurrentProgress"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentLeft="true"
-            android:gravity="center_vertical|left|end"
-            android:paddingLeft="8dp"
-            android:singleLine="true"
-            android:textColor="?colorOnSecondary"
-            android:textSize="12sp"
-            tools:ignore="RtlHardcoded,RtlSymmetry"
-            tools:text="00:22" />
-    </RelativeLayout>
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/songCurrentProgress"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:layout_alignParentLeft="true"
+			android:gravity="center_vertical|left|end"
+			android:paddingLeft="8dp"
+			android:singleLine="true"
+			android:textColor="?colorOnSecondary"
+			android:textSize="12sp"
+			tools:ignore="RtlHardcoded,RtlSymmetry"
+			tools:text="00:22" />
+	</RelativeLayout>
 
-    <LinearLayout
-        android:id="@+id/titleContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@+id/text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/progressContainer">
+	<LinearLayout
+		android:id="@+id/titleContainer"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		app:layout_constraintBottom_toTopOf="@+id/text"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintHorizontal_bias="0.5"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/progressContainer">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:ellipsize="marquee"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:freezesText="true"
-            android:gravity="center"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewHeadline6"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textStyle="bold"
-            tools:text="@tools:sample/lorem/random" />
-    </LinearLayout>
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/title"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:ellipsize="marquee"
+			android:focusable="true"
+			android:focusableInTouchMode="true"
+			android:freezesText="true"
+			android:gravity="center"
+			android:marqueeRepeatLimit="marquee_forever"
+			android:paddingStart="16dp"
+			android:paddingEnd="16dp"
+			android:scrollHorizontally="true"
+			android:singleLine="true"
+			android:textAppearance="@style/TextViewHeadline6"
+			android:textColor="?android:attr/textColorPrimary"
+			android:textStyle="bold"
+			tools:text="@tools:sample/lorem/random" />
+	</LinearLayout>
 
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:textAppearance="@style/TextViewBody2"
-        app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/titleContainer"
-        tools:text="@tools:sample/lorem/random" />
+	<com.google.android.material.textview.MaterialTextView
+		android:id="@+id/text"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"
+		android:ellipsize="end"
+		android:gravity="center"
+		android:maxLines="2"
+		android:paddingStart="16dp"
+		android:paddingEnd="16dp"
+		android:textAppearance="@style/TextViewBody2"
+		app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintHorizontal_bias="0.5"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/titleContainer"
+		tools:text="@tools:sample/lorem/random" />
 
-    <RelativeLayout
-        android:id="@+id/playerMediaControllerContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layoutDirection="ltr"
-        android:paddingStart="4dp"
-        android:paddingEnd="4dp"
-        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text"
-        tools:ignore="ContentDescription,UnusedAttribute"
-        tools:showIn="@layout/fragment_player_playback_controls">
+	<RelativeLayout
+		android:id="@+id/playerMediaControllerContainer"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layoutDirection="ltr"
+		android:paddingStart="4dp"
+		android:paddingEnd="4dp"
+		app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintHorizontal_bias="0.5"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/text"
+		tools:ignore="ContentDescription,UnusedAttribute"
+		tools:showIn="@layout/fragment_player_playback_controls">
 
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/previousButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="8dp"
-            android:layout_toStartOf="@+id/dummy_fab"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_skip_previous_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/previousButton"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_centerVertical="true"
+			android:layout_marginEnd="8dp"
+			android:layout_toStartOf="@+id/dummy_fab"
+			android:background="?attr/roundSelector"
+			android:padding="16dp"
+			android:scaleType="fitCenter"
+			app:srcCompat="@drawable/ic_skip_previous_white_24dp"
+			tools:ignore="MissingPrefix"
+			tools:tint="@color/md_black_1000" />
 
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/nextButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="8dp"
-            android:layout_toEndOf="@+id/dummy_fab"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_skip_next_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/nextButton"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_centerVertical="true"
+			android:layout_marginStart="8dp"
+			android:layout_toEndOf="@+id/dummy_fab"
+			android:background="?attr/roundSelector"
+			android:padding="16dp"
+			android:scaleType="fitCenter"
+			app:srcCompat="@drawable/ic_skip_next_white_24dp"
+			tools:ignore="MissingPrefix"
+			tools:tint="@color/md_black_1000" />
 
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/repeatButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_repeat_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/repeatButton"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentStart="true"
+			android:layout_centerVertical="true"
+			android:background="?attr/roundSelector"
+			android:padding="16dp"
+			android:scaleType="fitCenter"
+			app:srcCompat="@drawable/ic_repeat_white_24dp"
+			tools:ignore="MissingPrefix"
+			tools:tint="@color/md_black_1000" />
 
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/shuffleButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_shuffle_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/shuffleButton"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentEnd="true"
+			android:layout_centerVertical="true"
+			android:background="?attr/roundSelector"
+			android:padding="16dp"
+			android:scaleType="fitCenter"
+			app:srcCompat="@drawable/ic_shuffle_white_24dp"
+			tools:ignore="MissingPrefix"
+			tools:tint="@color/md_black_1000" />
 
-        <Space
-            android:id="@+id/dummy_fab"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
-            android:layout_centerInParent="true" />
+		<Space
+			android:id="@+id/dummy_fab"
+			android:layout_width="56dp"
+			android:layout_height="56dp"
+			android:layout_centerInParent="true" />
 
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/playPauseButton"
-            android:layout_width="52dp"
-            android:layout_height="52dp"
-            android:layout_centerInParent="true"
-            android:background="@drawable/color_circle_gradient"
-            android:elevation="4dp"
-            android:padding="16dp"
-            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/playPauseButton"
+			android:layout_width="52dp"
+			android:layout_height="52dp"
+			android:layout_centerInParent="true"
+			android:background="@drawable/color_circle_gradient"
+			android:elevation="4dp"
+			android:padding="16dp"
+			app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
 
-    </RelativeLayout>
+	</RelativeLayout>
 
-    <FrameLayout
-        android:id="@+id/volumeFragmentContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        tools:backgroundTint="@color/md_red_400"
-        tools:layout_height="52dp" />
+	<FrameLayout
+		android:id="@+id/volumeFragmentContainer"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="0"
+		android:paddingStart="8dp"
+		android:paddingEnd="8dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		tools:backgroundTint="@color/md_red_400"
+		tools:layout_height="52dp" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_card_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
index 2e709cd5f..aba4ceb1b 100644
--- a/app/src/main/res/layout/fragment_card_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
@@ -113,8 +113,8 @@
 				android:focusableInTouchMode="true"
 				android:freezesText="true"
 				android:marqueeRepeatLimit="marquee_forever"
+				android:maxLines="2"
 				android:scrollHorizontally="true"
-				android:singleLine="true"
 				android:textStyle="bold"
 				tools:text="@tools:sample/lorem/random" />
 		</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_color_player_playback_controls.xml b/app/src/main/res/layout/fragment_color_player_playback_controls.xml
index 2a0aa2776..5ff78beef 100644
--- a/app/src/main/res/layout/fragment_color_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_color_player_playback_controls.xml
@@ -1,211 +1,211 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/playback_controls"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:ignore="MissingPrefix">
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/playback_controls"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical"
+	tools:ignore="MissingPrefix">
 
-    <RelativeLayout
-        android:id="@+id/progressContainer"
-        android:layout_width="match_parent"
-        android:layout_height="28dp"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+	<RelativeLayout
+		android:id="@+id/progressContainer"
+		android:layout_width="match_parent"
+		android:layout_height="28dp"
+		android:paddingStart="12dp"
+		android:paddingEnd="12dp"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/songCurrentProgress"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentLeft="true"
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/songCurrentProgress"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:layout_alignParentLeft="true"
 
 
-            android:gravity="center_vertical|left|end"
-            android:paddingLeft="8dp"
-            android:singleLine="true"
-            android:textSize="12sp"
-            tools:ignore="RtlHardcoded,RtlSymmetry"
-            tools:text="00:22" />
+			android:gravity="center_vertical|left|end"
+			android:paddingLeft="8dp"
+			android:singleLine="true"
+			android:textSize="12sp"
+			tools:ignore="RtlHardcoded,RtlSymmetry"
+			tools:text="00:22" />
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/songTotalTime"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/songTotalTime"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:layout_alignParentRight="true"
 
 
-            android:gravity="center_vertical|right|end"
-            android:paddingRight="8dp"
-            android:singleLine="true"
-            android:textSize="12sp"
-            tools:ignore="RtlHardcoded,RtlSymmetry"
-            tools:text="04:22" />
+			android:gravity="center_vertical|right|end"
+			android:paddingRight="8dp"
+			android:singleLine="true"
+			android:textSize="12sp"
+			tools:ignore="RtlHardcoded,RtlSymmetry"
+			tools:text="04:22" />
 
-        <androidx.appcompat.widget.AppCompatSeekBar
-            android:id="@+id/progressSlider"
-            style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toLeftOf="@id/songTotalTime"
-            android:layout_toRightOf="@id/songCurrentProgress"
-            android:maxHeight="2dp"
-            android:progressDrawable="@drawable/color_progress_seek"
-            tools:ignore="RtlHardcoded,UnusedAttribute"
-            tools:progress="20" />
-    </RelativeLayout>
+		<androidx.appcompat.widget.AppCompatSeekBar
+			android:id="@+id/progressSlider"
+			style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_centerVertical="true"
+			android:layout_toLeftOf="@id/songTotalTime"
+			android:layout_toRightOf="@id/songCurrentProgress"
+			android:maxHeight="2dp"
+			android:progressDrawable="@drawable/color_progress_seek"
+			tools:ignore="RtlHardcoded,UnusedAttribute"
+			tools:progress="20" />
+	</RelativeLayout>
 
-    <LinearLayout
-        android:id="@+id/titleContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@+id/text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/progressContainer">
+	<LinearLayout
+		android:id="@+id/titleContainer"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		app:layout_constraintBottom_toTopOf="@+id/text"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintHorizontal_bias="0.5"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/progressContainer">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:ellipsize="marquee"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:freezesText="true"
-            android:gravity="center"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewHeadline6"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textStyle="bold"
-            tools:text="@tools:sample/lorem/random" />
-    </LinearLayout>
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/title"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:ellipsize="marquee"
+			android:focusable="true"
+			android:focusableInTouchMode="true"
+			android:freezesText="true"
+			android:gravity="center"
+			android:marqueeRepeatLimit="marquee_forever"
+			android:paddingStart="16dp"
+			android:paddingEnd="16dp"
+			android:scrollHorizontally="true"
+			android:singleLine="true"
+			android:textAppearance="@style/TextViewHeadline6"
+			android:textColor="?android:attr/textColorPrimary"
+			android:textStyle="bold"
+			tools:text="@tools:sample/lorem/random" />
+	</LinearLayout>
 
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:textAppearance="@style/TextViewBody2"
-        app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/titleContainer"
-        tools:text="@tools:sample/lorem/random" />
+	<com.google.android.material.textview.MaterialTextView
+		android:id="@+id/text"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"
+		android:ellipsize="end"
+		android:gravity="center"
+		android:maxLines="2"
+		android:paddingStart="16dp"
+		android:paddingEnd="16dp"
+		android:textAppearance="@style/TextViewBody2"
+		app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintHorizontal_bias="0.5"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/titleContainer"
+		tools:text="@tools:sample/lorem/random" />
 
 
-    <RelativeLayout
-        android:id="@+id/playerMediaControllerContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layoutDirection="ltr"
-        android:paddingStart="4dp"
-        android:paddingEnd="4dp"
-        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text"
-        tools:ignore="ContentDescription,UnusedAttribute"
-        tools:showIn="@layout/fragment_player_playback_controls">
+	<RelativeLayout
+		android:id="@+id/playerMediaControllerContainer"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layoutDirection="ltr"
+		android:paddingStart="4dp"
+		android:paddingEnd="4dp"
+		app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintHorizontal_bias="0.5"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/text"
+		tools:ignore="ContentDescription,UnusedAttribute"
+		tools:showIn="@layout/fragment_player_playback_controls">
 
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/previousButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="8dp"
-            android:layout_toStartOf="@+id/dummy_fab"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_skip_previous_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/previousButton"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_centerVertical="true"
+			android:layout_marginEnd="8dp"
+			android:layout_toStartOf="@+id/dummy_fab"
+			android:background="?attr/roundSelector"
+			android:padding="16dp"
+			android:scaleType="fitCenter"
+			app:srcCompat="@drawable/ic_skip_previous_white_24dp"
+			tools:ignore="MissingPrefix"
+			tools:tint="@color/md_black_1000" />
 
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/nextButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="8dp"
-            android:layout_toEndOf="@+id/dummy_fab"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_skip_next_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/nextButton"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_centerVertical="true"
+			android:layout_marginStart="8dp"
+			android:layout_toEndOf="@+id/dummy_fab"
+			android:background="?attr/roundSelector"
+			android:padding="16dp"
+			android:scaleType="fitCenter"
+			app:srcCompat="@drawable/ic_skip_next_white_24dp"
+			tools:ignore="MissingPrefix"
+			tools:tint="@color/md_black_1000" />
 
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/repeatButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_repeat_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/repeatButton"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentStart="true"
+			android:layout_centerVertical="true"
+			android:background="?attr/roundSelector"
+			android:padding="16dp"
+			android:scaleType="fitCenter"
+			app:srcCompat="@drawable/ic_repeat_white_24dp"
+			tools:ignore="MissingPrefix"
+			tools:tint="@color/md_black_1000" />
 
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/shuffleButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_shuffle_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/shuffleButton"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentEnd="true"
+			android:layout_centerVertical="true"
+			android:background="?attr/roundSelector"
+			android:padding="16dp"
+			android:scaleType="fitCenter"
+			app:srcCompat="@drawable/ic_shuffle_white_24dp"
+			tools:ignore="MissingPrefix"
+			tools:tint="@color/md_black_1000" />
 
-        <Space
-            android:id="@+id/dummy_fab"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
-            android:layout_centerInParent="true" />
+		<Space
+			android:id="@+id/dummy_fab"
+			android:layout_width="56dp"
+			android:layout_height="56dp"
+			android:layout_centerInParent="true" />
 
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/playPauseButton"
-            android:layout_width="52dp"
-            android:layout_height="52dp"
-            android:layout_centerInParent="true"
-            android:background="@drawable/color_circle_gradient"
-            android:elevation="4dp"
-            android:padding="16dp"
-            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/playPauseButton"
+			android:layout_width="52dp"
+			android:layout_height="52dp"
+			android:layout_centerInParent="true"
+			android:background="@drawable/color_circle_gradient"
+			android:elevation="4dp"
+			android:padding="16dp"
+			app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
 
-    </RelativeLayout>
+	</RelativeLayout>
 
-    <FrameLayout
-        android:id="@+id/volumeFragmentContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        tools:backgroundTint="@color/md_red_400"
-        tools:layout_height="52dp" />
+	<FrameLayout
+		android:id="@+id/volumeFragmentContainer"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="0"
+		android:paddingStart="8dp"
+		android:paddingEnd="8dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		tools:backgroundTint="@color/md_red_400"
+		tools:layout_height="52dp" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_fit_playback_controls.xml b/app/src/main/res/layout/fragment_fit_playback_controls.xml
index 2d4b38d99..69a17fbce 100644
--- a/app/src/main/res/layout/fragment_fit_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_fit_playback_controls.xml
@@ -1,107 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/playback_controls"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="vertical"
-    tools:ignore="MissingPrefix">
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/playback_controls"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:gravity="center_vertical"
+	android:orientation="vertical"
+	tools:ignore="MissingPrefix">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/progress_container_height"
-        android:background="@color/twenty_percent_black_overlay">
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/progress_container_height"
+		android:background="@color/twenty_percent_black_overlay">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/songCurrentProgress"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentLeft="true"
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/songCurrentProgress"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:layout_alignParentLeft="true"
+			android:gravity="center_vertical|left|end"
+			android:paddingLeft="8dp"
+			android:singleLine="true"
+			android:textColor="?android:attr/textColorSecondary"
+			android:textSize="12sp"
+			tools:ignore="RtlHardcoded,RtlSymmetry"
+			tools:text="00:22" />
 
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/songTotalTime"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:layout_alignParentRight="true"
+			android:gravity="center_vertical|right|end"
+			android:paddingRight="8dp"
+			android:singleLine="true"
+			android:textColor="?android:attr/textColorSecondary"
+			android:textSize="12sp"
+			tools:ignore="RtlHardcoded,RtlSymmetry"
+			tools:text="00:22" />
 
-            android:gravity="center_vertical|left|end"
-            android:paddingLeft="8dp"
-            android:singleLine="true"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="12sp"
-            tools:ignore="RtlHardcoded,RtlSymmetry"
-            tools:text="00:22" />
+		<androidx.appcompat.widget.AppCompatSeekBar
+			android:id="@+id/progressSlider"
+			style="@style/MusicProgressSlider"
+			android:layout_height="match_parent"
+			android:layout_toLeftOf="@id/songTotalTime"
+			android:layout_toRightOf="@id/songCurrentProgress"
+			tools:ignore="RtlHardcoded,UnusedAttribute" />
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/songTotalTime"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
+	</RelativeLayout>
 
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="0"
+		android:gravity="center"
+		android:orientation="vertical"
+		android:padding="8dp">
 
-            android:gravity="center_vertical|right|end"
-            android:paddingRight="8dp"
-            android:singleLine="true"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="12sp"
-            tools:ignore="RtlHardcoded,RtlSymmetry"
-            tools:text="00:22" />
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/title"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:ellipsize="marquee"
+			android:focusable="true"
+			android:focusableInTouchMode="true"
+			android:freezesText="true"
+			android:gravity="center"
+			android:marqueeRepeatLimit="marquee_forever"
+			android:paddingStart="16dp"
+			android:paddingEnd="16dp"
+			android:scrollHorizontally="true"
+			android:singleLine="true"
+			android:textAppearance="@style/TextViewHeadline6"
+			android:textStyle="bold"
+			tools:text="@tools:sample/lorem/random" />
 
-        <androidx.appcompat.widget.AppCompatSeekBar
-            android:id="@+id/progressSlider"
-            style="@style/MusicProgressSlider"
-            android:layout_height="match_parent"
-            android:layout_toLeftOf="@id/songTotalTime"
-            android:layout_toRightOf="@id/songCurrentProgress"
-            tools:ignore="RtlHardcoded,UnusedAttribute" />
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:ellipsize="end"
+			android:gravity="center"
+			android:maxLines="2"
+			android:paddingStart="16dp"
+			android:paddingTop="8dp"
+			android:paddingEnd="16dp"
+			android:textAppearance="@style/TextViewBody2"
+			tools:text="@tools:sample/lorem/random" />
+	</LinearLayout>
 
-    </RelativeLayout>
+	<include layout="@layout/media_button" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="8dp">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:ellipsize="marquee"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:freezesText="true"
-            android:gravity="center"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewHeadline6"
-            android:textStyle="bold"
-            tools:text="@tools:sample/lorem/random" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:maxLines="1"
-            android:paddingStart="16dp"
-            android:paddingTop="8dp"
-            android:paddingEnd="16dp"
-            android:textAppearance="@style/TextViewBody2"
-            tools:text="@tools:sample/lorem/random" />
-    </LinearLayout>
-
-    <include layout="@layout/media_button" />
-
-    <FrameLayout
-        android:id="@+id/volumeFragmentContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp" />
+	<FrameLayout
+		android:id="@+id/volumeFragmentContainer"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="0"
+		android:paddingStart="8dp"
+		android:paddingEnd="8dp" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
index f39d5a6b9..a43b31abf 100644
--- a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
@@ -23,8 +23,6 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
-
-
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
@@ -38,8 +36,6 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-
-
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
diff --git a/app/src/main/res/layout/fragment_full_player_controls.xml b/app/src/main/res/layout/fragment_full_player_controls.xml
index d80447f57..02afc960c 100644
--- a/app/src/main/res/layout/fragment_full_player_controls.xml
+++ b/app/src/main/res/layout/fragment_full_player_controls.xml
@@ -1,217 +1,217 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/player_footer_frame"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    tools:background="@color/md_grey_800">
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/player_footer_frame"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	tools:background="@color/md_grey_800">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+	<androidx.constraintlayout.widget.ConstraintLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/playerMenu"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/roundSelector"
-            android:padding="12dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_more_vert_white_24dp" />
+		<androidx.appcompat.widget.AppCompatImageView
+			android:id="@+id/playerMenu"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:background="?attr/roundSelector"
+			android:padding="12dp"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:srcCompat="@drawable/ic_more_vert_white_24dp" />
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:ellipsize="marquee"
-            android:gravity="center"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewHeadline6"
-            android:textColor="@color/md_white_1000"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toStartOf="@+id/songFavourite"
-            app:layout_constraintStart_toEndOf="@+id/playerMenu"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="@tools:sample/lorem/random" />
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/title"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:ellipsize="marquee"
+			android:gravity="center"
+			android:marqueeRepeatLimit="marquee_forever"
+			android:paddingStart="8dp"
+			android:paddingEnd="8dp"
+			android:singleLine="true"
+			android:textAppearance="@style/TextViewHeadline6"
+			android:textColor="@color/md_white_1000"
+			android:textStyle="bold"
+			app:layout_constraintEnd_toStartOf="@+id/songFavourite"
+			app:layout_constraintStart_toEndOf="@+id/playerMenu"
+			app:layout_constraintTop_toTopOf="parent"
+			tools:text="@tools:sample/lorem/random" />
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/text"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:alpha="0.75"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:maxLines="1"
-            android:paddingStart="8dp"
-            android:paddingTop="12dp"
-            android:paddingEnd="8dp"
-            android:textColor="@color/md_white_1000"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/songFavourite"
-            app:layout_constraintStart_toEndOf="@+id/playerMenu"
-            app:layout_constraintTop_toBottomOf="@+id/title"
-            tools:text="@tools:sample/lorem" />
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/text"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:alpha="0.75"
+			android:ellipsize="end"
+			android:gravity="center"
+			android:maxLines="2"
+			android:paddingStart="8dp"
+			android:paddingTop="12dp"
+			android:paddingEnd="8dp"
+			android:textColor="@color/md_white_1000"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toStartOf="@+id/songFavourite"
+			app:layout_constraintStart_toEndOf="@+id/playerMenu"
+			app:layout_constraintTop_toBottomOf="@+id/title"
+			tools:text="@tools:sample/lorem/random" />
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/songFavourite"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/roundSelector"
-            android:padding="12dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.0"
-            app:srcCompat="@drawable/ic_favorite_border_white_24dp" />
+		<androidx.appcompat.widget.AppCompatImageView
+			android:id="@+id/songFavourite"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:background="?attr/roundSelector"
+			android:padding="12dp"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintVertical_bias="0.0"
+			app:srcCompat="@drawable/ic_favorite_border_white_24dp" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+	</androidx.constraintlayout.widget.ConstraintLayout>
 
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/progress_slider_height"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp">
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/progress_slider_height"
+		android:layout_marginTop="8dp"
+		android:layout_marginBottom="8dp"
+		android:paddingStart="12dp"
+		android:paddingEnd="12dp">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/songCurrentProgress"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentLeft="true"
-            android:fontFamily="sans-serif-medium"
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/songCurrentProgress"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:layout_alignParentLeft="true"
+			android:fontFamily="sans-serif-medium"
 
-            android:gravity="center_vertical|left|end"
-            android:paddingLeft="8dp"
-            android:singleLine="true"
-            android:textColor="@color/md_white_1000"
-            android:textSize="12sp"
-            tools:ignore="RtlHardcoded,RtlSymmetry"
-            tools:text="00:00" />
+			android:gravity="center_vertical|left|end"
+			android:paddingLeft="8dp"
+			android:singleLine="true"
+			android:textColor="@color/md_white_1000"
+			android:textSize="12sp"
+			tools:ignore="RtlHardcoded,RtlSymmetry"
+			tools:text="00:00" />
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/songTotalTime"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:fontFamily="sans-serif-medium"
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/songTotalTime"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:layout_alignParentRight="true"
+			android:fontFamily="sans-serif-medium"
 
-            android:gravity="center_vertical|right|end"
-            android:paddingRight="8dp"
-            android:singleLine="true"
-            android:textColor="@color/md_white_1000"
-            android:textSize="12sp"
-            tools:ignore="RtlHardcoded,RtlSymmetry"
-            tools:text="00:00" />
+			android:gravity="center_vertical|right|end"
+			android:paddingRight="8dp"
+			android:singleLine="true"
+			android:textColor="@color/md_white_1000"
+			android:textSize="12sp"
+			tools:ignore="RtlHardcoded,RtlSymmetry"
+			tools:text="00:00" />
 
-        <androidx.appcompat.widget.AppCompatSeekBar
-            android:id="@+id/progressSlider"
-            style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toLeftOf="@id/songTotalTime"
-            android:layout_toRightOf="@id/songCurrentProgress"
-            android:maxHeight="3dp"
-            android:progressDrawable="@drawable/color_progress_seek"
-            android:splitTrack="false"
-            tools:ignore="RtlHardcoded,UnusedAttribute"
-            tools:progress="20" />
-    </RelativeLayout>
+		<androidx.appcompat.widget.AppCompatSeekBar
+			android:id="@+id/progressSlider"
+			style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_centerVertical="true"
+			android:layout_toLeftOf="@id/songTotalTime"
+			android:layout_toRightOf="@id/songCurrentProgress"
+			android:maxHeight="3dp"
+			android:progressDrawable="@drawable/color_progress_seek"
+			android:splitTrack="false"
+			tools:ignore="RtlHardcoded,UnusedAttribute"
+			tools:progress="20" />
+	</RelativeLayout>
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layoutDirection="ltr"
-        android:minHeight="96dp"
-        tools:ignore="ContentDescription,UnusedAttribute">
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layoutDirection="ltr"
+		android:minHeight="96dp"
+		tools:ignore="ContentDescription,UnusedAttribute">
 
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/previousButton"
-            android:layout_width="52dp"
-            android:layout_height="52dp"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="8dp"
-            android:layout_toStartOf="@+id/playPauseButton"
-            android:layout_toLeftOf="@+id/playPauseButton"
-            android:background="?attr/roundSelector"
-            android:padding="8dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_skip_previous_white_24dp"
-            tools:ignore="MissingPrefix" />
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/previousButton"
+			android:layout_width="52dp"
+			android:layout_height="52dp"
+			android:layout_centerVertical="true"
+			android:layout_marginEnd="8dp"
+			android:layout_toStartOf="@+id/playPauseButton"
+			android:layout_toLeftOf="@+id/playPauseButton"
+			android:background="?attr/roundSelector"
+			android:padding="8dp"
+			android:scaleType="fitCenter"
+			app:srcCompat="@drawable/ic_skip_previous_white_24dp"
+			tools:ignore="MissingPrefix" />
 
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/nextButton"
-            android:layout_width="52dp"
-            android:layout_height="52dp"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="8dp"
-            android:layout_toEndOf="@+id/playPauseButton"
-            android:layout_toRightOf="@+id/playPauseButton"
-            android:background="?attr/roundSelector"
-            android:padding="8dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_skip_next_white_24dp"
-            tools:ignore="MissingPrefix" />
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/nextButton"
+			android:layout_width="52dp"
+			android:layout_height="52dp"
+			android:layout_centerVertical="true"
+			android:layout_marginStart="8dp"
+			android:layout_toEndOf="@+id/playPauseButton"
+			android:layout_toRightOf="@+id/playPauseButton"
+			android:background="?attr/roundSelector"
+			android:padding="8dp"
+			android:scaleType="fitCenter"
+			app:srcCompat="@drawable/ic_skip_next_white_24dp"
+			tools:ignore="MissingPrefix" />
 
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/repeatButton"
-            android:layout_width="52dp"
-            android:layout_height="52dp"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:background="?attr/roundSelector"
-            android:padding="12dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_repeat_white_24dp"
-            tools:ignore="MissingPrefix" />
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/repeatButton"
+			android:layout_width="52dp"
+			android:layout_height="52dp"
+			android:layout_alignParentStart="true"
+			android:layout_alignParentLeft="true"
+			android:layout_centerVertical="true"
+			android:background="?attr/roundSelector"
+			android:padding="12dp"
+			android:scaleType="fitCenter"
+			app:srcCompat="@drawable/ic_repeat_white_24dp"
+			tools:ignore="MissingPrefix" />
 
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/shuffleButton"
-            android:layout_width="52dp"
-            android:layout_height="52dp"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="?attr/roundSelector"
-            android:padding="12dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_shuffle_white_24dp"
-            tools:ignore="MissingPrefix" />
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/shuffleButton"
+			android:layout_width="52dp"
+			android:layout_height="52dp"
+			android:layout_alignParentEnd="true"
+			android:layout_alignParentRight="true"
+			android:layout_centerVertical="true"
+			android:background="?attr/roundSelector"
+			android:padding="12dp"
+			android:scaleType="fitCenter"
+			app:srcCompat="@drawable/ic_shuffle_white_24dp"
+			tools:ignore="MissingPrefix" />
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/playPauseButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:background="@drawable/line_button"
-            android:foreground="?attr/roundSelector"
-            android:padding="20dp"
-            android:scaleType="fitCenter"
-            app:backgroundTint="@color/md_grey_200"
-            app:borderWidth="0dp"
-            app:elevation="0dp"
-            app:fabCustomSize="68dp"
-            app:fabSize="auto"
-            app:maxImageSize="32dp"
-            app:pressedTranslationZ="12dp"
-            tools:ignore="MissingPrefix"
-            tools:src="@drawable/ic_pause_white_24dp" />
+		<com.google.android.material.floatingactionbutton.FloatingActionButton
+			android:id="@+id/playPauseButton"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_centerInParent="true"
+			android:background="@drawable/line_button"
+			android:foreground="?attr/roundSelector"
+			android:padding="20dp"
+			android:scaleType="fitCenter"
+			app:backgroundTint="@color/md_grey_200"
+			app:borderWidth="0dp"
+			app:elevation="0dp"
+			app:fabCustomSize="68dp"
+			app:fabSize="auto"
+			app:maxImageSize="32dp"
+			app:pressedTranslationZ="12dp"
+			tools:ignore="MissingPrefix"
+			tools:src="@drawable/ic_pause_white_24dp" />
 
-    </RelativeLayout>
+	</RelativeLayout>
 
-    <FrameLayout
-        android:id="@+id/volumeFragmentContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0" />
+	<FrameLayout
+		android:id="@+id/volumeFragmentContainer"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="0" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
index 87a6f7177..ae795ddd5 100644
--- a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
@@ -1,208 +1,216 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/playback_controls"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingTop="8dp"
-    tools:ignore="MissingPrefix">
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/playback_controls"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical"
+	android:paddingTop="8dp"
+	tools:ignore="MissingPrefix">
 
-    <RelativeLayout
-        android:id="@+id/progressContainer"
-        android:layout_width="match_parent"
-        android:layout_height="28dp"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+	<RelativeLayout
+		android:id="@+id/progressContainer"
+		android:layout_width="match_parent"
+		android:layout_height="28dp"
+		android:paddingStart="12dp"
+		android:paddingEnd="12dp"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/songCurrentProgress"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentLeft="true"
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/songCurrentProgress"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:layout_alignParentLeft="true"
+			android:gravity="center_vertical|left|end"
+			android:paddingLeft="8dp"
+			android:singleLine="true"
+			android:textColor="?android:attr/textColorSecondary"
+			android:textSize="12sp"
+			tools:ignore="RtlHardcoded,RtlSymmetry"
+			tools:text="00:22" />
+
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/songTotalTime"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:layout_alignParentRight="true"
+			android:gravity="center_vertical|right|end"
+			android:paddingRight="8dp"
+			android:singleLine="true"
+			android:textColor="?android:attr/textColorSecondary"
+			android:textSize="12sp"
+			tools:ignore="RtlHardcoded,RtlSymmetry"
+			tools:text="00:22" />
+
+		<androidx.appcompat.widget.AppCompatSeekBar
+			android:id="@+id/progressSlider"
+			style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_centerVertical="true"
+			android:layout_toLeftOf="@id/songTotalTime"
+			android:layout_toRightOf="@id/songCurrentProgress"
+			android:maxHeight="2dp"
+			android:progressDrawable="@drawable/color_progress_seek"
+			android:splitTrack="false"
+			tools:ignore="RtlHardcoded,UnusedAttribute"
+			tools:progress="20" />
+	</RelativeLayout>
+
+	<LinearLayout
+		android:id="@+id/titleContainer"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:fadingEdge="horizontal"
+		app:layout_constraintBottom_toTopOf="@+id/text"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintHorizontal_bias="0.5"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/progressContainer">
+
+		<com.google.android.material.textview.MaterialTextView
+			android:id="@+id/title"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:ellipsize="marquee"
+			android:focusable="true"
+			android:focusableInTouchMode="true"
+			android:freezesText="true"
+			android:gravity="center"
+			android:marqueeRepeatLimit="marquee_forever"
+			android:paddingStart="16dp"
+			android:paddingEnd="16dp"
+			android:scrollHorizontally="true"
+			android:singleLine="true"
+			android:textAppearance="@style/TextViewHeadline6"
+			android:textColor="?android:attr/textColorPrimary"
+			android:textStyle="bold"
+			app:layout_constraintBottom_toTopOf="@+id/text"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintHorizontal_bias="0.5"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/progressContainer"
+			tools:text="@tools:sample/lorem/random" />
+	</LinearLayout>
+
+	<com.google.android.material.textview.MaterialTextView
+		android:id="@+id/text"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"
+		android:ellipsize="end"
+		android:gravity="center"
+		android:maxLines="2"
+		android:paddingStart="16dp"
+		android:paddingEnd="16dp"
+		android:textAppearance="@style/TextViewBody1"
+		android:textColor="?android:attr/textColorSecondary"
+		app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintHorizontal_bias="0.5"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/titleContainer"
+		tools:text="@tools:sample/lorem/random" />
 
 
-            android:gravity="center_vertical|left|end"
-            android:paddingLeft="8dp"
-            android:singleLine="true"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="12sp"
-            tools:ignore="RtlHardcoded,RtlSymmetry"
-            tools:text="00:22" />
+	<RelativeLayout
+		android:id="@+id/playerMediaControllerContainer"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layoutDirection="ltr"
+		android:paddingStart="4dp"
+		android:paddingEnd="4dp"
+		app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintHorizontal_bias="0.5"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/text"
+		tools:ignore="ContentDescription,UnusedAttribute"
+		tools:showIn="@layout/fragment_player_playback_controls">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/songTotalTime"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/previousButton"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_centerVertical="true"
+			android:layout_marginEnd="8dp"
+			android:layout_toStartOf="@+id/dummy_fab"
+			android:background="?attr/roundSelector"
+			android:padding="16dp"
+			android:scaleType="fitCenter"
+			app:srcCompat="@drawable/ic_skip_previous_white_24dp"
+			tools:ignore="MissingPrefix"
+			tools:tint="@color/md_black_1000" />
 
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/nextButton"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_centerVertical="true"
+			android:layout_marginStart="8dp"
+			android:layout_toEndOf="@+id/dummy_fab"
+			android:background="?attr/roundSelector"
+			android:padding="16dp"
+			android:scaleType="fitCenter"
+			app:srcCompat="@drawable/ic_skip_next_white_24dp"
+			tools:ignore="MissingPrefix"
+			tools:tint="@color/md_black_1000" />
 
-            android:gravity="center_vertical|right|end"
-            android:paddingRight="8dp"
-            android:singleLine="true"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="12sp"
-            tools:ignore="RtlHardcoded,RtlSymmetry"
-            tools:text="00:22" />
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/repeatButton"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentStart="true"
+			android:layout_centerVertical="true"
+			android:background="?attr/roundSelector"
+			android:padding="16dp"
+			android:scaleType="fitCenter"
+			app:srcCompat="@drawable/ic_repeat_white_24dp"
+			tools:ignore="MissingPrefix"
+			tools:tint="@color/md_black_1000" />
 
-        <androidx.appcompat.widget.AppCompatSeekBar
-            android:id="@+id/progressSlider"
-            style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toLeftOf="@id/songTotalTime"
-            android:layout_toRightOf="@id/songCurrentProgress"
-            android:maxHeight="2dp"
-            android:progressDrawable="@drawable/color_progress_seek"
-            android:splitTrack="false"
-            tools:ignore="RtlHardcoded,UnusedAttribute"
-            tools:progress="20" />
-    </RelativeLayout>
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/shuffleButton"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentEnd="true"
+			android:layout_centerVertical="true"
+			android:background="?attr/roundSelector"
+			android:padding="16dp"
+			android:scaleType="fitCenter"
+			app:srcCompat="@drawable/ic_shuffle_white_24dp"
+			tools:ignore="MissingPrefix"
+			tools:tint="@color/md_black_1000" />
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:freezesText="true"
-        android:gravity="center"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:scrollHorizontally="true"
-        android:singleLine="true"
-        android:textAppearance="@style/TextViewHeadline6"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/progressContainer"
-        tools:text="@tools:sample/lorem/random" />
+		<Space
+			android:id="@+id/dummy_fab"
+			android:layout_width="56dp"
+			android:layout_height="56dp"
+			android:layout_centerInParent="true" />
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:textAppearance="@style/TextViewBody1"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/title"
-        tools:text="@tools:sample/lorem/random" />
+		<androidx.appcompat.widget.AppCompatImageButton
+			android:id="@+id/playPauseButton"
+			android:layout_width="52dp"
+			android:layout_height="52dp"
+			android:layout_centerInParent="true"
+			android:background="@drawable/color_circle_gradient"
+			android:elevation="4dp"
+			android:padding="16dp"
+			app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
 
+	</RelativeLayout>
 
-    <RelativeLayout
-        android:id="@+id/playerMediaControllerContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layoutDirection="ltr"
-        android:paddingStart="4dp"
-        android:paddingEnd="4dp"
-        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text"
-        tools:ignore="ContentDescription,UnusedAttribute"
-        tools:showIn="@layout/fragment_player_playback_controls">
-
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/previousButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="8dp"
-            android:layout_toStartOf="@+id/dummy_fab"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_skip_previous_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
-
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/nextButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="8dp"
-            android:layout_toEndOf="@+id/dummy_fab"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_skip_next_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
-
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/repeatButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_repeat_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
-
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/shuffleButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:background="?attr/roundSelector"
-            android:padding="16dp"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_shuffle_white_24dp"
-            tools:ignore="MissingPrefix"
-            tools:tint="@color/md_black_1000" />
-
-        <Space
-            android:id="@+id/dummy_fab"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
-            android:layout_centerInParent="true" />
-
-        <androidx.appcompat.widget.AppCompatImageButton
-            android:id="@+id/playPauseButton"
-            android:layout_width="52dp"
-            android:layout_height="52dp"
-            android:layout_centerInParent="true"
-            android:background="@drawable/color_circle_gradient"
-            android:elevation="4dp"
-            android:padding="16dp"
-            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
-
-    </RelativeLayout>
-
-    <FrameLayout
-        android:id="@+id/volumeFragmentContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        tools:backgroundTint="@color/md_red_400"
-        tools:layout_height="52dp" />
+	<FrameLayout
+		android:id="@+id/volumeFragmentContainer"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:paddingStart="8dp"
+		android:paddingEnd="8dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		tools:backgroundTint="@color/md_red_400"
+		tools:layout_height="52dp" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_material_playback_controls.xml b/app/src/main/res/layout/fragment_material_playback_controls.xml
index 6c0291e1e..2c1997a92 100644
--- a/app/src/main/res/layout/fragment_material_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_material_playback_controls.xml
@@ -24,8 +24,6 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
-
-
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
@@ -39,8 +37,6 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-
-
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
@@ -102,7 +98,7 @@
         android:layout_gravity="center"
         android:ellipsize="end"
         android:gravity="center"
-        android:maxLines="1"
+        android:maxLines="2"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewBody1"
diff --git a/app/src/main/res/layout/fragment_plain_controls_fragment.xml b/app/src/main/res/layout/fragment_plain_controls_fragment.xml
index 779ed8236..6e49f57ae 100644
--- a/app/src/main/res/layout/fragment_plain_controls_fragment.xml
+++ b/app/src/main/res/layout/fragment_plain_controls_fragment.xml
@@ -22,8 +22,6 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
-
-
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
@@ -37,8 +35,6 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-
-
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
diff --git a/app/src/main/res/layout/fragment_player_playback_controls.xml b/app/src/main/res/layout/fragment_player_playback_controls.xml
index 525003fd3..b1dfa4dee 100755
--- a/app/src/main/res/layout/fragment_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_player_playback_controls.xml
@@ -103,7 +103,7 @@
         android:layout_gravity="center"
         android:ellipsize="end"
         android:gravity="center"
-        android:maxLines="1"
+        android:maxLines="2"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewBody1"
diff --git a/app/src/main/res/layout/fragment_simple_controls_fragment.xml b/app/src/main/res/layout/fragment_simple_controls_fragment.xml
index 740b3eaef..7e4fc9713 100644
--- a/app/src/main/res/layout/fragment_simple_controls_fragment.xml
+++ b/app/src/main/res/layout/fragment_simple_controls_fragment.xml
@@ -43,7 +43,7 @@
         android:layout_gravity="center"
         android:ellipsize="end"
         android:gravity="center"
-        android:maxLines="1"
+        android:maxLines="2"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewBody2"