diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerPlaybackControlsFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerPlaybackControlsFragment.java
index 58198a38..52df303b 100644
--- a/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerPlaybackControlsFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerPlaybackControlsFragment.java
@@ -134,9 +134,6 @@ public class CardPlayerPlaybackControlsFragment extends AbsMusicServiceFragment
         } else {
             playerFabPlayPauseDrawable.setPlay(animate);
         }
-
-        binding.progressBarLoading.setVisibility(MusicPlayerRemote.isBuffering() ? View.VISIBLE : View.GONE);
-        binding.progressBarPlaying.setVisibility(MusicPlayerRemote.isBuffering() ? View.GONE : View.VISIBLE);
     }
 
     public void updateBufferingIndicatorColor(int color) {
@@ -238,8 +235,11 @@ public class CardPlayerPlaybackControlsFragment extends AbsMusicServiceFragment
 
     @Override
     public void onUpdateProgressViews(int progress, int total) {
+        binding.playerBufferingIndicator.setVisibility(MusicPlayerRemote.isBuffering() ? View.VISIBLE : View.GONE);
+
         binding.playerProgressSlider.setMax(total);
         binding.playerProgressSlider.setProgress(progress);
+
         binding.playerSongTotalTime.setText(MusicUtil.getReadableDurationString(total));
         binding.playerSongCurrentProgress.setText(MusicUtil.getReadableDurationString(progress));
     }
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 c22099ae..3d27383d 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,8 +7,8 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <RelativeLayout
-        android:id="@+id/progress_bar_loading"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/progress_bar_playing"
         android:layout_width="match_parent"
         android:layout_height="@dimen/progress_container_height"
         android:background="@color/twenty_percent_black_overlay">
@@ -16,25 +16,20 @@
         <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/player_buffering_indicator"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/progress_container_height"
+            android:layout_height="match_parent"
             android:indeterminate="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:mpb_progressStyle="horizontal"
             app:mpb_useIntrinsicPadding="false"
             style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal.NoPadding" />
 
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/progress_bar_playing"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/progress_container_height"
-        android:background="@color/twenty_percent_black_overlay">
-
         <TextView
             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|left|end"
             android:paddingLeft="8dp"
@@ -42,7 +37,9 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
             android:textColor="?android:textColorSecondary"
             android:textSize="12sp"
-            tools:ignore="RtlHardcoded,RtlSymmetry" />
+            app:layout_constraintStart_toStartOf="parent"
+            tools:ignore="RtlSymmetry"
+            tools:text="0:00" />
 
         <TextView
             android:id="@+id/player_song_total_time"
@@ -56,17 +53,19 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
             android:textColor="?android:textColorSecondary"
             android:textSize="12sp"
-            tools:ignore="RtlHardcoded,RtlSymmetry" />
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:ignore="RtlSymmetry"
+            tools:text="4:00" />
 
         <SeekBar
             android:id="@+id/player_progress_slider"
-            style="@style/MusicProgressSlider"
+            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"
-            tools:ignore="RtlHardcoded,UnusedAttribute" />
+            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"