diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java
index 56462e64..02dde037 100644
--- a/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java
+++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java
@@ -274,7 +274,7 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
     public void onColorChanged(int color) {
         animateColorChange(color);
         playbackControlsFragment.setDark(ColorUtil.isColorLight(color));
-        playbackControlsFragment.updateBufferingIndicatorColor(ColorUtil.invertColor(color));
+        playbackControlsFragment.updateBufferingIndicatorColor(color);
         getCallbacks().onPaletteColorChanged();
     }
 
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 4149768b..58198a38 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,10 +134,13 @@ public class CardPlayerPlaybackControlsFragment extends AbsMusicServiceFragment
         } else {
             playerFabPlayPauseDrawable.setPlay(animate);
         }
-        binding.playerBufferingIndicator.setVisibility(MusicPlayerRemote.isBuffering() ? View.VISIBLE : View.GONE);
+
+        binding.progressBarLoading.setVisibility(MusicPlayerRemote.isBuffering() ? View.VISIBLE : View.GONE);
+        binding.progressBarPlaying.setVisibility(MusicPlayerRemote.isBuffering() ? View.GONE : View.VISIBLE);
     }
 
     public void updateBufferingIndicatorColor(int color) {
+        binding.playerBufferingIndicator.setProgressBackgroundTintList(ColorStateList.valueOf(getResources().getColor(android.R.color.transparent)));
         binding.playerBufferingIndicator.setIndeterminateTintList(ColorStateList.valueOf(color));
     }
 
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 ab8777dc..72574fef 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
@@ -8,6 +8,24 @@
     android:orientation="vertical">
 
     <RelativeLayout
+        android:id="@+id/progress_bar_loading"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/progress_container_height"
+        android:background="@color/twenty_percent_black_overlay">
+
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        android:id="@+id/player_buffering_indicator"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/progress_container_height"
+        android:indeterminate="true"
+        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">
@@ -122,11 +140,6 @@
             app:elevation="4dp"
             app:pressedTranslationZ="2dp" />
 
-        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
-            android:id="@+id/player_buffering_indicator"
-            android:layout_width="74dp"
-            android:layout_height="74dp"
-            android:layout_centerInParent="true" />
     </RelativeLayout>
 
 </LinearLayout>