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 580bd68b..6e1444e3 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
@@ -7,7 +7,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/progress_container_height"
         android:background="@color/twenty_percent_black_overlay">
@@ -16,7 +16,6 @@
             android:id="@+id/player_song_current_progress"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_alignParentStart="true"
             android:fontFamily="sans-serif-medium"
             android:gravity="center_vertical|start"
             android:paddingStart="8dp"
@@ -24,6 +23,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
             android:textColor="?android:textColorSecondary"
             android:textSize="12sp"
+            app:layout_constraintStart_toStartOf="parent"
             tools:ignore="RtlSymmetry"
             tools:text="0:00" />
 
@@ -31,7 +31,6 @@
             android:id="@+id/player_song_total_time"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
             android:fontFamily="sans-serif-medium"
             android:gravity="center_vertical|end"
             android:paddingEnd="8dp"
@@ -39,17 +38,19 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
             android:textColor="?android:textColorSecondary"
             android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
             tools:ignore="RtlSymmetry"
             tools:text="4:00" />
 
         <SeekBar
             android:id="@+id/player_progress_slider"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_toStartOf="@id/player_song_total_time"
-            android:layout_toEndOf="@id/player_song_current_progress"
+            app:layout_constraintStart_toEndOf="@id/player_song_current_progress"
+            app:layout_constraintEnd_toStartOf="@id/player_song_total_time"
             style="@style/MusicProgressSlider" />
 
-    </RelativeLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <RelativeLayout
         android:id="@+id/player_media_controller_container"
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 5b4e0169..7e56079f 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
@@ -7,7 +7,7 @@
     android:orientation="vertical"
     tools:background="@color/md_amber_500">
 
-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/progress_container_height"
         android:background="@color/twenty_percent_black_overlay">
@@ -16,7 +16,6 @@
             android:id="@+id/player_song_current_progress"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_alignParentStart="true"
             android:fontFamily="sans-serif-medium"
             android:gravity="center_vertical|start"
             android:paddingStart="8dp"
@@ -24,6 +23,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
             android:textColor="@color/ate_primary_text_dark"
             android:textSize="12sp"
+            app:layout_constraintStart_toStartOf="parent"
             tools:ignore="RtlSymmetry"
             tools:text="0:00" />
 
@@ -31,7 +31,6 @@
             android:id="@+id/player_song_total_time"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
             android:fontFamily="sans-serif-medium"
             android:gravity="center_vertical|end"
             android:paddingEnd="8dp"
@@ -39,17 +38,19 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
             android:textColor="@color/ate_primary_text_dark"
             android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
             tools:ignore="RtlSymmetry"
             tools:text="4:00" />
 
         <SeekBar
             android:id="@+id/player_progress_slider"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_toStartOf="@id/player_song_total_time"
-            android:layout_toEndOf="@id/player_song_current_progress"
+            app:layout_constraintStart_toEndOf="@id/player_song_current_progress"
+            app:layout_constraintEnd_toStartOf="@id/player_song_total_time"
             style="@style/MusicProgressSlider" />
 
-    </RelativeLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <RelativeLayout
         android:id="@+id/player_media_controller_container"