diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadAdapter.kt
index d0740f66a81..f6f02d864a6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadAdapter.kt
@@ -17,6 +17,7 @@ import com.lagradost.cloudstream3.ui.NoStateAdapter
 import com.lagradost.cloudstream3.ui.ViewHolderState
 import com.lagradost.cloudstream3.ui.download.button.DownloadStatusTell
 import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
+import com.lagradost.cloudstream3.utils.DataStoreHelper.fixVisual
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
@@ -151,22 +152,12 @@ class DownloadAdapter(
         downloadHeaderGotoChild.isVisible = false
 
         val posDur = getViewPos(card.data.id)
-        watchProgressContainer.isVisible = true
         downloadHeaderEpisodeProgress.apply {
             isVisible = posDur != null
             posDur?.let {
-                val max = (it.duration / 1000).toInt()
-                val progress = (it.position / 1000).toInt()
-
-                if (max > 0 && progress >= (0.95 * max).toInt()) {
-                    playIcon.setImageResource(R.drawable.ic_baseline_check_24)
-                    isVisible = false
-                } else {
-                    playIcon.setImageResource(R.drawable.netflix_play)
-                    this.max = max
-                    this.progress = progress
-                    isVisible = true
-                }
+                val visualPos = it.fixVisual()
+                max = (visualPos.duration / 1000).toInt()
+                progress = (visualPos.position / 1000).toInt()
             }
         }
 
@@ -199,7 +190,6 @@ class DownloadAdapter(
                 )
         }
 
-        downloadHeaderInfo.isVisible = true
         downloadButton.setDefaultClickListener(card.child, downloadHeaderInfo, onItemClickEvent)
         downloadButton.isVisible = !isMultiDeleteState
 
@@ -220,7 +210,6 @@ class DownloadAdapter(
         formattedSize: String
     ) {
         downloadButton.resetViewData()
-        watchProgressContainer.isVisible = false
         downloadButton.isVisible = false
         downloadHeaderEpisodeProgress.isVisible = false
         downloadHeaderGotoChild.isVisible = !isMultiDeleteState
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
index 818e79d7456..9bc7619ad10 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
@@ -209,26 +209,14 @@ class EpisodeAdapter(
                     if (item.videoWatchState == VideoWatchState.Watched) {
                         // This cannot be done in getDisplayPosition() as when you have not watched something
                         // the duration and position is 0
-                        //episodeProgress.max = 1
-                        //episodeProgress.progress = 1
-                        episodePlayIcon.setImageResource(R.drawable.ic_baseline_check_24)
-                        episodeProgress.isVisible = false
+                        episodeProgress.max = 1
+                        episodeProgress.progress = 1
+                        episodeProgress.isVisible = true
                     } else {
                         val displayPos = item.getDisplayPosition()
-                        val durationSec = (item.duration / 1000).toInt()
-                        val progressSec = (displayPos / 1000).toInt()
-
-                        if (displayPos >= item.duration && displayPos > 0) {
-                            episodePlayIcon.setImageResource(R.drawable.ic_baseline_check_24)
-                            episodeProgress.isVisible = false
-                        } else {
-                            episodePlayIcon.setImageResource(R.drawable.netflix_play)
-                            episodeProgress.apply {
-                                max = durationSec
-                                progress = progressSec
-                                isVisible = displayPos > 0L
-                            }
-                        }
+                        episodeProgress.max = (item.duration / 1000).toInt()
+                        episodeProgress.progress = (displayPos / 1000).toInt()
+                        episodeProgress.isVisible = displayPos > 0L
                     }
 
                     val posterVisible = !item.poster.isNullOrBlank()
@@ -423,24 +411,16 @@ class EpisodeAdapter(
                     episodeText.isSelected = true // is needed for text repeating
 
                     if (item.videoWatchState == VideoWatchState.Watched) {
-                        episodePlayIcon.setImageResource(R.drawable.ic_baseline_check_24)
-                        episodeProgress.isVisible = false
+                        // This cannot be done in getDisplayPosition() as when you have not watched something
+                        // the duration and position is 0
+                        episodeProgress.max = 1
+                        episodeProgress.progress = 1
+                        episodeProgress.isVisible = true
                     } else {
                         val displayPos = item.getDisplayPosition()
-                        val durationSec = (item.duration / 1000).toInt()
-                        val progressSec = (displayPos / 1000).toInt()
-
-                        if (displayPos >= item.duration && displayPos > 0) {
-                            episodePlayIcon.setImageResource(R.drawable.ic_baseline_check_24)
-                            episodeProgress.isVisible = false
-                        } else {
-                            episodePlayIcon.setImageResource(R.drawable.play_button_transparent)
-                            episodeProgress.apply {
-                                max = durationSec
-                                progress = progressSec
-                                isVisible = displayPos > 0L
-                            }
-                        }
+                        episodeProgress.max = (item.duration / 1000).toInt()
+                        episodeProgress.progress = (displayPos / 1000).toInt()
+                        episodeProgress.isVisible = displayPos > 0L
                     }
 
                     itemView.setOnClickListener {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
index f6d0fee7680..9c15a6dd365 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
@@ -17,6 +17,7 @@ import android.view.animation.Animation
 import android.view.animation.DecelerateInterpolator
 import android.widget.AbsListView
 import android.widget.ArrayAdapter
+import android.widget.Button
 import android.widget.Toast
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
@@ -65,6 +66,7 @@ import com.lagradost.cloudstream3.ui.result.ResultFragment.updateUIEvent
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper
 import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
+import com.lagradost.cloudstream3.utils.AppContextUtils.getShortSeasonText
 import com.lagradost.cloudstream3.utils.AppContextUtils.isCastApiAvailable
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadCache
 import com.lagradost.cloudstream3.utils.AppContextUtils.openBrowser
@@ -607,57 +609,59 @@ open class ResultFragmentPhone : FullScreenPlayer() {
         }*/
 
         observeNullable(viewModel.resumeWatching) { resume ->
+            if (resume == null) {
+                resultBinding?.resultResumeParent?.isVisible = false
+                return@observeNullable
+            }
+
             resultBinding?.apply {
-                if (resume == null) {
-                    resultResumeParent.isVisible = false
-                    resultPlayParent.isVisible = true
-                    resultResumeProgressHolder.isVisible = false
-                    return@observeNullable
-                }
                 resultResumeParent.isVisible = true
+
+                val setEpisodeText: (Button) -> Unit = { button ->
+                    button.text =  context?.let {
+                        "${it.getString(R.string.resume)} ${it.getShortSeasonText(
+                            resume.result.episode,
+                            resume.result.season
+                        )}"
+                    }
+                }
+
                 resume.progress?.let { progress ->
                     resultNextSeriesButton.isVisible = false
-                    resultResumeSeriesTitle.apply {
-                        isVisible = !resume.isMovie
-                        text =
-                            if (resume.isMovie) null else context?.getNameFull(
-                                resume.result.name,
-                                resume.result.episode,
-                                resume.result.season
-                            )
-                    }
-                    if (resume.isMovie) {
-                        resultPlayParent.isGone = true
-                        resultResumeSeriesProgressText.isVisible = true
-                        resultResumeSeriesProgressText.setText(progress.progressLeft)
-                    }
+                    resultResumeSeriesProgressText.setText(progress.progressLeft)
+
                     resultResumeSeriesProgress.apply {
                         isVisible = true
-                        this.max = progress.maxProgress
+                        max = progress.maxProgress
                         this.progress = progress.progress
                     }
+
+                    if (!resume.isMovie) {
+                        setEpisodeText(resultResumeSeriesButton)
+                        resultMovieParent.isGone = true
+                    }
+
+                    resultResumeSeriesButton.isVisible = true
+                    resultPlayMovie.isGone = true
                     resultResumeProgressHolder.isVisible = true
+
                 } ?: run {
-                    resultResumeProgressHolder.isVisible = false
                     if (!resume.isMovie) {
+                        resultResumeSeriesButton.isVisible = false
+                        setEpisodeText(resultNextSeriesButton)
                         resultNextSeriesButton.isVisible = true
-                        resultNextSeriesButton.text = context?.getNameFull(
-                            resume.result.name,
-                            resume.result.episode,
-                            resume.result.season
-                        )
+                        resultMovieParent.isGone = true
+                    } else {
+                        resultResumeParent.isGone = true
                     }
+
+                    resultResumeProgressHolder.isVisible = false
                     resultResumeSeriesProgress.isVisible = false
-                    resultResumeSeriesTitle.isVisible = false
                     resultResumeSeriesProgressText.isVisible = false
                 }
 
-                resultResumeSeriesButton.setOnClickListener {
-                    resumeAction(storedData, resume)
-                }
-                resultNextSeriesButton.setOnClickListener {
-                    resumeAction(storedData, resume)
-                }
+                resultResumeSeriesButton.setOnClickListener { resumeAction(storedData, resume) }
+                resultNextSeriesButton.setOnClickListener { resumeAction(storedData, resume) }
             }
         }
 
diff --git a/app/src/main/res/drawable/play_button.xml b/app/src/main/res/drawable/play_button.xml
index ee3d47dfe97..3f5d1a92130 100644
--- a/app/src/main/res/drawable/play_button.xml
+++ b/app/src/main/res/drawable/play_button.xml
@@ -9,11 +9,17 @@
     <path
         android:name="path"
         android:pathData="M 421.44 17.5 C 336.15 17.5 253.011 44.513 184.01 94.646 C 115.009 144.778 63.626 215.5 37.27 296.616 C 10.914 377.732 10.914 465.148 37.27 546.264 C 63.626 627.38 115.009 698.102 184.01 748.234 C 253.011 798.367 336.15 825.38 421.44 825.38 C 506.73 825.38 589.869 798.367 658.87 748.234 C 727.871 698.102 779.254 627.38 805.61 546.264 C 831.966 465.148 831.966 377.732 805.61 296.616 C 779.254 215.5 727.871 144.778 658.87 94.646 C 589.869 44.513 506.73 17.5 421.44 17.5 Z"
-        android:fillColor="#B3000000"
+        android:fillColor="#66000000"
         android:strokeWidth="1"/>
     <path
         android:name="path_2"
         android:pathData="M 598.91 419.24 L 333.91 266.24 L 333.91 572.24 L 598.91 419.24 Z"
-        android:fillColor="#ffffff"
+        android:fillColor="#f2f2f2"
         android:strokeWidth="1"/>
+    <path
+        android:name="path_1"
+        android:pathData="M 421.44 17.5 C 336.15 17.5 253.011 44.513 184.01 94.646 C 115.009 144.778 63.626 215.5 37.27 296.616 C 10.914 377.732 10.914 465.148 37.27 546.264 C 63.626 627.38 115.009 698.102 184.01 748.234 C 253.011 798.367 336.15 825.38 421.44 825.38 C 506.73 825.38 589.869 798.367 658.87 748.234 C 727.871 698.102 779.254 627.38 805.61 546.264 C 831.966 465.148 831.966 377.732 805.61 296.616 C 779.254 215.5 727.871 144.778 658.87 94.646 C 589.869 44.513 506.73 17.5 421.44 17.5 Z"
+        android:strokeColor="#f2f2f2"
+        android:strokeWidth="25"
+        android:strokeMiterLimit="10"/>
 </vector>
diff --git a/app/src/main/res/drawable/progress_bar_rounded.xml b/app/src/main/res/drawable/progress_bar_rounded.xml
new file mode 100644
index 00000000000..142bce1a35b
--- /dev/null
+++ b/app/src/main/res/drawable/progress_bar_rounded.xml
@@ -0,0 +1,16 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/transparent"/>
+            <corners android:radius="@dimen/rounded_button_radius"/>
+        </shape>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape android:shape="rectangle">
+                <solid android:color="?attr/colorPrimary"/>
+                <corners android:radius="@dimen/rounded_button_radius"/>
+            </shape>
+        </clip>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/layout/download_child_episode.xml b/app/src/main/res/layout/download_child_episode.xml
index cb9c13d5394..e53e63d312f 100644
--- a/app/src/main/res/layout/download_child_episode.xml
+++ b/app/src/main/res/layout/download_child_episode.xml
@@ -14,44 +14,30 @@
     app:cardCornerRadius="@dimen/rounded_image_radius"
     app:cardElevation="0dp">
 
-<!--    <androidx.core.widget.ContentLoadingProgressBar-->
-<!--        android:id="@+id/download_child_episode_progress"-->
-<!--        style="@android:style/Widget.Material.ProgressBar.Horizontal"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="5dp"-->
-<!--        android:layout_gravity="bottom"-->
-<!--        android:layout_marginBottom="-1.5dp"-->
-<!--        android:progressBackgroundTint="?attr/colorPrimary"-->
-<!--        android:progressTint="?attr/colorPrimary"-->
-<!--        tools:progress="50" />-->
+    <androidx.core.widget.ContentLoadingProgressBar
+        android:id="@+id/download_child_episode_progress"
+        style="@android:style/Widget.Material.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="5dp"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="-1.5dp"
+        android:progressBackgroundTint="?attr/colorPrimary"
+        android:progressTint="?attr/colorPrimary"
+        tools:progress="50" />
 
     <GridLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:foreground="?android:attr/selectableItemBackgroundBorderless">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center">
-
-            <FrameLayout
-                android:id="@+id/watch_progress_container"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="5dp">
-
-                <ImageView
-                    android:id="@+id/download_child_episode_play"
-                    style="@style/ContinueWatchingPlayUnderlayProgress"
-                    android:layout_margin="4dp"/>
-
-                <com.google.android.material.progressindicator.CircularProgressIndicator
-                    android:id="@+id/download_child_episode_progress"
-                    style="@style/ContinueWatchingCircularProgress"
-                    android:progress="50"/>
-            </FrameLayout>
+        <ImageView
+            android:id="@+id/download_child_episode_play"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:contentDescription="@string/episode_play_img_des"
+            android:src="@drawable/ic_baseline_play_arrow_24"
+            android:visibility="gone" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -86,7 +72,7 @@
                 android:textColor="?attr/grayTextColor"
                 tools:text="128MB / 237MB" />
         </LinearLayout>
-        </LinearLayout>
+
         <com.lagradost.cloudstream3.ui.download.button.PieFetchButton
             android:id="@+id/download_button"
             android:layout_width="@dimen/download_size"
diff --git a/app/src/main/res/layout/download_header_episode.xml b/app/src/main/res/layout/download_header_episode.xml
index 7b8b2c91eb5..385fb2e0bb9 100644
--- a/app/src/main/res/layout/download_header_episode.xml
+++ b/app/src/main/res/layout/download_header_episode.xml
@@ -14,16 +14,16 @@
     app:cardBackgroundColor="?attr/boxItemBackground"
     app:cardCornerRadius="@dimen/rounded_image_radius">
 
-<!--    <androidx.core.widget.ContentLoadingProgressBar-->
-<!--        android:id="@+id/download_header_episode_progress"-->
-<!--        style="@android:style/Widget.Material.ProgressBar.Horizontal"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="5dp"-->
-<!--        android:layout_gravity="bottom"-->
-<!--        android:layout_marginBottom="-1.5dp"-->
-<!--        android:progressBackgroundTint="?attr/white"-->
-<!--        android:progressTint="?attr/white"-->
-<!--        tools:progress="50" />-->
+    <androidx.core.widget.ContentLoadingProgressBar
+        android:id="@+id/download_header_episode_progress"
+        style="@android:style/Widget.Material.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="5dp"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="-1.5dp"
+        android:progressBackgroundTint="?attr/colorPrimary"
+        android:progressTint="?attr/colorPrimary"
+        tools:progress="50" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -42,23 +42,6 @@
                 android:contentDescription="@string/episode_poster_img_des"
                 android:scaleType="centerCrop"
                 tools:src="@drawable/example_poster" />
-            <FrameLayout
-                android:id="@+id/watch_progress_container"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:visibility="gone"
-                tools:visibility="visible">
-
-                <com.google.android.material.imageview.ShapeableImageView
-                    android:id="@+id/play_icon"
-                    style="@style/DownloadHeaderPlayUnderlayProgress"
-                    />
-                <com.google.android.material.progressindicator.CircularProgressIndicator
-                    android:id="@+id/download_header_episode_progress"
-                    style="@style/DownloadHeaderCircularProgress"
-                    tools:progress="100" />
-            </FrameLayout>
         </androidx.cardview.widget.CardView>
 
         <LinearLayout
diff --git a/app/src/main/res/layout/fragment_downloads.xml b/app/src/main/res/layout/fragment_downloads.xml
index d6f41d6b0b8..af798cc31de 100644
--- a/app/src/main/res/layout/fragment_downloads.xml
+++ b/app/src/main/res/layout/fragment_downloads.xml
@@ -310,7 +310,7 @@
             android:nextFocusLeft="@id/navigation_downloads"
             android:tag="@string/tv_no_focus_tag"
             tools:listitem="@layout/download_header_episode" />
- 
+
         <TextView
             android:id="@+id/text_no_downloads"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml
index c6de5954279..80e74a66eb0 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -578,125 +578,78 @@
                             android:visibility="gone"
                             app:icon="@drawable/ic_baseline_add_24" />
 
-                        <FrameLayout
-                            android:id="@+id/result_resume_progress_holder"
+                        <LinearLayout
+                            android:id="@+id/result_resume_parent"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            android:paddingVertical="5dp"
+                            android:layout_marginVertical="5dp"
+                            android:orientation="vertical"
                             android:visibility="gone"
                             tools:visibility="visible">
+
+
                             <com.google.android.material.button.MaterialButton
                                 android:id="@+id/result_resume_series_button"
                                 style="@style/WhiteButton"
                                 android:layout_width="match_parent"
-                                android:layout_margin="0dp"
-                                android:visibility="visible"/>
 
-                            <LinearLayout
-                                android:id="@+id/progress_group"
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:orientation="horizontal"
-                                android:gravity="center">
-
-                                    <FrameLayout
-                                        android:id="@+id/watch_progress_container"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:layout_gravity="center">
-                                        <ImageView
-                                            android:id="@+id/episode_play_icon"
-                                            style="@style/ContinueWatchingPlayUnderlayProgress"
-                                            app:tint="?attr/black" />
-                                        <com.google.android.material.progressindicator.CircularProgressIndicator
-                                            android:id="@+id/result_resume_series_progress"
-                                            style="@style/ContinueWatchingCircularProgress"
-                                            app:indicatorColor="?attr/iconGrayBackground"
-                                            app:trackColor="@color/skipOpTransparent"
-                                            tools:progress="50" />
-                                    </FrameLayout>
-                                    <TextView
-                                        android:id="@+id/result_resume_series_title"
-                                        style="@style/Widget.MaterialComponents.Button.TextButton"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="match_parent"
-                                        android:gravity="center_vertical"
-                                        android:textColor="?attr/iconGrayBackground"
-                                        android:textSize="15sp"
-                                        android:textStyle="bold"
-                                        tools:text="S1E1 Episode 1"
-                                        android:visibility="visible"
-                                        tools:visibility="visible"
-                                        tools:ignore="RtlSymmetry"
-                                        android:paddingStart="5dp"
-                                        android:textAllCaps="false"
-                                        android:maxLines="1"
-                                        android:ellipsize="end"
-                                        android:clickable="false"
-                                        android:focusable="false" />
-                                    <TextView
-                                        android:id="@+id/result_resume_series_progress_text"
-                                        style="@style/Widget.MaterialComponents.Button.TextButton"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="match_parent"
-                                        android:gravity="center"
-                                        android:paddingStart="5dp"
-                                        android:textColor="?attr/iconGrayBackground"
-                                        tools:text="69m remaining"
-                                        android:textStyle="bold"
-                                        tools:ignore="RtlSymmetry"
-                                        android:textSize="15sp"
-                                        android:visibility="gone"
-                                        tools:visibility="visible"
-                                        android:maxLines="1"
-                                        android:textAllCaps="false"
-                                        android:clickable="false"
-                                        android:focusable="false"/>
-                                </LinearLayout>
-                        </FrameLayout>
-                        <LinearLayout
-                            android:id="@+id/result_resume_parent"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            android:visibility="gone"
-                            tools:visibility="visible">
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginStart="0dp"
+                                android:layout_marginEnd="0dp"
+                                android:nextFocusUp="@id/result_bookmark_Button"
+                                android:nextFocusDown="@id/result_download_movie"
+                                android:text="@string/resume"
+                                app:icon="@drawable/ic_baseline_play_arrow_24"
+                                tools:visibility="visible"
+                                android:visibility="gone"
+                                android:ellipsize="end"
+                                android:maxLines="1"/>
+
                             <com.google.android.material.button.MaterialButton
                                 android:id="@+id/result_next_series_button"
                                 style="@style/WhiteButton"
                                 android:layout_width="match_parent"
-                                android:layout_marginVertical="5dp"
+
                                 android:layout_gravity="center_vertical"
                                 android:layout_marginStart="0dp"
                                 android:layout_marginEnd="0dp"
                                 android:nextFocusUp="@id/result_bookmark_Button"
                                 android:nextFocusDown="@id/result_download_movie"
-                                android:text="S1E2 Episode 2"
+                                android:text="@string/next_episode"
+                                app:icon="@drawable/cast_ic_mini_controller_skip_next"
                                 android:visibility="gone"
                                 tools:visibility="visible"
-                                app:icon="@drawable/cast_ic_mini_controller_skip_next" 
-                                android:maxLines="1"
-                                android:ellipsize="end"/>
+                                android:ellipsize="end"
+                                android:maxLines="1"/>
+
+                            <!--                            <TextView-->
+                            <!--                                android:id="@+id/result_resume_series_title"-->
+                            <!--                                android:layout_width="match_parent"-->
+                            <!--                                android:layout_height="wrap_content"-->
+                            <!--                                android:textColor="?attr/textColor"-->
+                            <!--                                android:textSize="17sp"-->
+                            <!--                                android:textStyle="bold"-->
+                            <!--                                tools:text="S1E1 Episode 1"-->
+                            <!--                                android:visibility="gone"/>-->
                         </LinearLayout>
+
                         <LinearLayout
                             android:id="@+id/result_movie_parent"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:layout_marginVertical="5dp"
                             android:orientation="vertical"
                             tools:visibility="visible">
-                            <LinearLayout
-                                android:id="@+id/result_play_parent"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginVertical="5dp">
+
                             <com.google.android.material.button.MaterialButton
                                 android:id="@+id/result_play_movie"
                                 style="@style/WhiteButton"
                                 android:layout_width="match_parent"
+
                                 android:layout_gravity="center_vertical"
                                 android:layout_marginStart="0dp"
                                 android:layout_marginEnd="0dp"
+                                android:layout_marginBottom="10dp"
                                 android:nextFocusUp="@id/result_bookmark_Button"
                                 android:nextFocusDown="@id/result_download_movie"
                                 android:text="@string/play_movie_button"
@@ -706,7 +659,8 @@
                                 <requestFocus />
 
                             </com.google.android.material.button.MaterialButton>
-                            </LinearLayout>
+
+
                             <!--<com.google.android.material.button.MaterialButton
                                     android:nextFocusUp="@id/result_play_movie"
                                     android:nextFocusDown="@id/result_season_button"
@@ -729,7 +683,6 @@
                                 android:id="@+id/download_button"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="5dp"
                                 app:download_layout="@layout/download_button_layout" />
 
                             <!--<androidx.core.widget.ContentLoadingProgressBar
@@ -756,6 +709,44 @@
                                       android:layout_height="match_parent" />-->
                         </LinearLayout>
 
+                        <LinearLayout
+                            android:id="@+id/result_resume_progress_holder"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:layout_marginBottom="5dp"
+                            android:visibility="gone"
+                            tools:visibility="visible">
+
+                            <androidx.core.widget.ContentLoadingProgressBar
+                                android:id="@+id/result_resume_series_progress"
+                                style="?android:attr/progressBarStyleHorizontal"
+                                android:layout_width="match_parent"
+                                android:layout_height="20dp"
+                                android:layout_gravity="end|center_vertical"
+                                android:layout_weight="1"
+                                android:indeterminate="false"
+                                android:max="100"
+                                android:progress="0"
+                                android:progressBackgroundTint="?attr/colorPrimary"
+                                android:visibility="visible"
+                                tools:progress="50"
+                                tools:visibility="visible" />
+
+                            <TextView
+                                android:id="@+id/result_resume_series_progress_text"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:layout_weight="0"
+                                android:gravity="center"
+                                android:paddingStart="10dp"
+                                android:textColor="?attr/grayTextColor"
+                                tools:ignore="RtlSymmetry"
+                                tools:text="69m\nremaining" />
+                        </LinearLayout>
+
+
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -958,4 +949,4 @@
                 android:contentDescription="@string/search_poster_descript"/>
     </androidx.cardview.widget.CardView>-->
 
-</FrameLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_result_tv.xml b/app/src/main/res/layout/fragment_result_tv.xml
index 3dff8f0d535..e56cd3e8b7c 100644
--- a/app/src/main/res/layout/fragment_result_tv.xml
+++ b/app/src/main/res/layout/fragment_result_tv.xml
@@ -38,24 +38,24 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
             tools:src="@drawable/profile_bg_dark_blue" />
 
         <ImageView
-            android:layout_marginBottom="-1dp"
             android:layout_width="match_parent"
             android:layout_height="120dp"
             android:layout_gravity="bottom"
+            android:layout_marginBottom="-1dp"
             android:src="@drawable/background_shadow" />
 
         <ImageView
             android:id="@+id/background_poster_watermark_badge_holder"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:maxWidth="220dp"
-            android:maxHeight="72dp"
             android:layout_gravity="bottom|start"
             android:layout_marginStart="@dimen/result_padding"
             android:layout_marginBottom="56dp"
             android:adjustViewBounds="true"
-            android:scaleType="fitStart"
-            android:contentDescription="@null" />
+            android:contentDescription="@null"
+            android:maxWidth="220dp"
+            android:maxHeight="72dp"
+            android:scaleType="fitStart" />
 
     </FrameLayout>
 
@@ -236,71 +236,69 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
 
                 <LinearLayout
                     android:id="@+id/result_resume_progress_holder"
-                    android:layout_width="wrap_content"
+                    android:layout_width="300dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dp"
-                    android:orientation="horizontal"
                     android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
+                    android:orientation="vertical"
                     android:visibility="gone"
                     tools:visibility="visible">
-                    <TextView
-                        android:id="@+id/result_resume_series_title"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="2"
-                        android:textColor="?attr/textColor"
-                        android:layout_gravity="center_vertical"
-                        android:textSize="17sp"
-                        android:textStyle="bold"
-                        tools:text="S1E1 Episode 1"
-                        android:visibility="visible"
-                        tools:visibility="visible"
-                        android:paddingEnd="10dp"/>
-                    <!--https://github.com/material-components/material-components-android/blob/master/docs/components/ProgressIndicator.md-->
-<!--                    <com.google.android.material.progressindicator.LinearProgressIndicator-->
-<!--                        android:id="@+id/result_resume_series_progress"-->
-
-<!--                        style="@style/RoundProgressbar"-->
-
-<!--                        android:layout_width="100dp"-->
-<!--                        android:layout_height="20dp"-->
-<!--                        android:layout_gravity="end|center_vertical"-->
-<!--                        android:layout_weight="1"-->
-<!--                        android:indeterminate="false"-->
-<!--                        android:max="100"-->
-<!--                        android:paddingEnd="10dp"-->
-<!--                        android:progress="0"-->
-
-<!--                        android:scrollbarStyle="outsideInset"-->
-<!--                        tools:ignore="RtlSymmetry"-->
-<!--                        tools:progress="25"-->
-<!--                        tools:visibility="visible" />-->
-                    <FrameLayout
-                        android:id="@+id/watch_progress_container"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center">
 
-                        <ImageView
-                            android:id="@+id/episode_play_icon"
-                            style="@style/ContinueWatchingPlayUnderlayProgress"/>
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="3dp">
 
-                        <com.google.android.material.progressindicator.CircularProgressIndicator
-                            android:id="@+id/result_resume_series_progress"
-                            style="@style/ContinueWatchingCircularProgress"
-                            tools:progress="50" />
-                    </FrameLayout>
+                        <TextView
+                            android:id="@+id/result_resume_series_title"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:paddingEnd="10dp"
+                            android:textColor="?attr/textColor"
+                            android:textSize="17sp"
+                            android:textStyle="bold"
+                            android:visibility="visible"
+                            tools:text="S1E1 Episode 1"
+                            tools:visibility="visible"
+                            android:ellipsize="end"
+                            android:maxLines="2"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintEnd_toStartOf="@id/result_resume_series_progress_text"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintBottom_toBottomOf="parent"/>
 
-                    <TextView
-                        android:id="@+id/result_resume_series_progress_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:maxLines="2"
-                        android:textColor="?attr/grayTextColor"
+                        <TextView
+                            android:id="@+id/result_resume_series_progress_text"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:gravity="center"
+                            android:maxLines="2"
+                            android:textColor="?attr/grayTextColor"
+                            tools:ignore="RtlSymmetry"
+                            tools:text="69m\nremaining"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintBottom_toBottomOf="parent"/>
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <com.google.android.material.progressindicator.LinearProgressIndicator
+                        android:id="@+id/result_resume_series_progress"
+                        style="@style/RoundProgressbar"
+                        android:layout_width="match_parent"
+                        android:layout_height="20dp"
+                        android:layout_gravity="end|center_vertical"
+                        android:layout_weight="1"
+                        android:indeterminate="false"
+                        android:max="100"
+                        android:paddingEnd="10dp"
+                        android:progress="0"
+                        android:scrollbarStyle="outsideInset"
                         tools:ignore="RtlSymmetry"
-                        android:gravity="center"
-                        android:layout_gravity="center_vertical"
-                        tools:text="69m\nremaining" />
+                        tools:progress="25"
+                        tools:visibility="visible"
+                        android:layout_marginTop="5dp"/>
                 </LinearLayout>
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/home_result_grid.xml b/app/src/main/res/layout/home_result_grid.xml
index ff07d9a954f..34bde53299f 100644
--- a/app/src/main/res/layout/home_result_grid.xml
+++ b/app/src/main/res/layout/home_result_grid.xml
@@ -61,9 +61,23 @@
             tools:text="The Perfect Run" />
     </LinearLayout>
 
+    <ImageView
+        android:id="@+id/search_item_download_play"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_gravity="center"
+        android:src="@drawable/play_button" />
 
-
-
+    <androidx.core.widget.ContentLoadingProgressBar
+        android:id="@+id/watchProgress"
+        style="@android:style/Widget.Material.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="5dp"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="-1.5dp"
+        android:progressBackgroundTint="?attr/colorPrimary"
+        android:progressTint="?attr/colorPrimary"
+        tools:progress="50" />
 
     <!--<View
             android:id="@+id/search_result_lang"
@@ -116,21 +130,4 @@
             tools:text="🇸🇪"
             tools:visibility="visible" />
     </LinearLayout>
-
-    <FrameLayout
-        android:id="@+id/watch_progress_container"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center">
-
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/search_item_download_play"
-            style="@style/HomePlayUnderlayProgress"
-            />
-        <com.google.android.material.progressindicator.CircularProgressIndicator
-            android:id="@+id/watchProgress"
-            style="@style/HomeCircularProgress"
-            tools:progress="50" />
-
-    </FrameLayout>
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/home_result_grid_expanded.xml b/app/src/main/res/layout/home_result_grid_expanded.xml
index 2726ad33e15..1c87f36c6b6 100644
--- a/app/src/main/res/layout/home_result_grid_expanded.xml
+++ b/app/src/main/res/layout/home_result_grid_expanded.xml
@@ -48,71 +48,23 @@
                 tools:src="@drawable/example_poster" />
 
 
-            <FrameLayout
-                android:id="@+id/watch_progress_container"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center">
-
-                <com.google.android.material.imageview.ShapeableImageView
-                    android:id="@+id/search_item_download_play"
-                    style="@style/HomePlayUnderlayProgress"
-                    />
-                <com.google.android.material.progressindicator.CircularProgressIndicator
-                    android:id="@+id/watchProgress"
-                    style="@style/HomeCircularProgress"
-                    tools:progress="50" />
-
-            </FrameLayout>
-<!--            <FrameLayout-->
-<!--                android:id="@+id/small_watch_progress_container"-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_gravity="bottom|end"-->
-<!--                android:visibility="gone"-->
-<!--                tools:visibility="visible"-->
-<!--                >-->
-
-<!--                <ImageView-->
-<!--                    android:id="@+id/small_episode_play_icon"-->
-<!--                    android:layout_width="30dp"-->
-<!--                    android:layout_height="30dp"-->
-<!--                    android:src="@drawable/play_button"-->
-<!--                    android:layout_gravity="center" />-->
-
-<!--                <com.google.android.material.progressindicator.CircularProgressIndicator-->
-<!--                    android:id="@+id/small_episode_progress"-->
-<!--                    android:layout_width="30dp"-->
-<!--                    android:layout_height="30dp"-->
-<!--                    app:indicatorSize="28.75dp"-->
-<!--                    app:trackThickness="2.5dp"-->
-<!--                    android:progressBackgroundTint="?attr/colorPrimary"-->
-<!--                    android:progressTint="?attr/colorPrimary"-->
-<!--                    tools:progress="50" />-->
-<!--            </FrameLayout>-->
-<!--            <FrameLayout-->
-<!--                android:id="@+id/playProgressContainer"-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_gravity="bottom|end">-->
-
-<!--                <ImageView-->
-<!--                    android:id="@+id/search_item_download_play"-->
-<!--                    android:layout_width="50dp"-->
-<!--                    android:layout_height="50dp"-->
-<!--                    android:src="@drawable/play_button"-->
-<!--                    android:layout_gravity="center" />-->
-
-<!--                <com.google.android.material.progressindicator.CircularProgressIndicator-->
-<!--                    android:id="@+id/watchProgress"-->
-<!--                    android:layout_width="25dp"-->
-<!--                    android:layout_height="25dp"-->
-<!--                    app:indicatorSize="23.75dp"-->
-<!--                    app:trackThickness="2.5dp"-->
-<!--                    android:progressBackgroundTint="?attr/colorPrimary"-->
-<!--                    android:progressTint="?attr/colorPrimary"-->
-<!--                    tools:progress="50" />-->
-<!--            </FrameLayout>-->
+            <ImageView
+                android:id="@+id/search_item_download_play"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_gravity="center"
+                android:src="@drawable/play_button" />
+
+            <androidx.core.widget.ContentLoadingProgressBar
+                android:id="@+id/watchProgress"
+                style="@android:style/Widget.Material.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="5dp"
+                android:layout_gravity="bottom"
+                android:layout_marginBottom="-1.5dp"
+                android:progressBackgroundTint="?attr/colorPrimary"
+                android:progressTint="?attr/colorPrimary"
+                tools:progress="50" />
 
             <!--<View
                     android:id="@+id/search_result_lang"
@@ -172,7 +124,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
                 android:orientation="vertical"
-                android:paddingBottom="3dp">
+                android:paddingBottom="5dp">
                 <TextView
                     android:id="@+id/episode_text"
                     android:layout_width="wrap_content"
@@ -198,4 +150,4 @@
             android:textSize="13sp"
             tools:text="The Perfect Run\nThe Perfect Run\nhello" />
     </LinearLayout>
-</androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/result_episode.xml b/app/src/main/res/layout/result_episode.xml
index 19f6688899b..77aa928bbb8 100644
--- a/app/src/main/res/layout/result_episode.xml
+++ b/app/src/main/res/layout/result_episode.xml
@@ -40,16 +40,16 @@
                 android:layout_height="match_parent">
         </View>
     </LinearLayout>-->
-<!--    <androidx.core.widget.ContentLoadingProgressBar-->
-<!--        android:id="@+id/episode_progress"-->
-<!--        style="@android:style/Widget.Material.ProgressBar.Horizontal"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="5dp"-->
-<!--        android:layout_gravity="bottom"-->
-<!--        android:layout_marginBottom="-1.5dp"-->
-<!--        android:progressBackgroundTint="?attr/colorPrimary"-->
-<!--        android:progressTint="?attr/colorPrimary"-->
-<!--        tools:progress="50" />-->
+    <androidx.core.widget.ContentLoadingProgressBar
+        android:id="@+id/episode_progress"
+        style="@android:style/Widget.Material.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="5dp"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="-1.5dp"
+        android:progressBackgroundTint="?attr/colorPrimary"
+        android:progressTint="?attr/colorPrimary"
+        tools:progress="50" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -57,22 +57,16 @@
         android:foreground="?android:attr/selectableItemBackgroundBorderless"
         android:orientation="horizontal">
 
-        <FrameLayout
-            android:id="@+id/watch_progress_container"
+        <ImageView
+            android:id="@+id/episode_play"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:layout_gravity="center">
-
-            <ImageView
-                android:id="@+id/episode_play_icon"
-                style="@style/ContinueWatchingPlayUnderlayProgress"
-                android:layout_margin="4dp"/>
-
-            <com.google.android.material.progressindicator.CircularProgressIndicator
-                android:id="@+id/episode_progress"
-                style="@style/ContinueWatchingCircularProgress" />
-        </FrameLayout>
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:contentDescription="@string/episode_play_img_des"
+            android:src="@drawable/ic_baseline_play_arrow_24"
+            app:tint="?attr/textColor" />
         <!--marquee_forever-->
         <com.google.android.material.button.MaterialButton
             android:id="@+id/episode_filler"
diff --git a/app/src/main/res/layout/result_episode_large.xml b/app/src/main/res/layout/result_episode_large.xml
index 5e003de3075..935beac1a7e 100644
--- a/app/src/main/res/layout/result_episode_large.xml
+++ b/app/src/main/res/layout/result_episode_large.xml
@@ -46,14 +46,14 @@
                     tools:src="@drawable/example_poster"
                     tools:visibility="invisible" />
 
-<!--                <ImageView-->
-<!--                    android:id="@+id/episode_play_icon"-->
-<!--                    android:layout_width="36dp"-->
-<!--                    android:layout_height="36dp"-->
-<!--                    android:layout_gravity="center"-->
-<!--                    android:contentDescription="@string/play_episode"-->
-<!--                    android:src="@drawable/play_button"-->
-<!--                    tools:visibility="invisible" />-->
+                <ImageView
+                    android:id="@+id/episode_play_icon"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_gravity="center"
+                    android:contentDescription="@string/play_episode"
+                    android:src="@drawable/play_button"
+                    tools:visibility="invisible" />
 
                 <ImageView
                     android:id="@+id/episode_upcoming_icon"
@@ -64,21 +64,16 @@
                     android:visibility="gone"
                     tools:visibility="visible" />
 
-                <FrameLayout
-                    android:id="@+id/watch_progress_container"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center">
-
-                    <com.google.android.material.imageview.ShapeableImageView
-                        android:id="@+id/episode_play_icon"
-                        style="@style/EpisodePlayUnderlayProgress"
-                        />
-                    <com.google.android.material.progressindicator.CircularProgressIndicator
-                        android:id="@+id/episode_progress"
-                        style="@style/EpisodeCircularProgress"
-                        tools:progress="100" />
-                </FrameLayout>
+                <androidx.core.widget.ContentLoadingProgressBar
+                    android:id="@+id/episode_progress"
+                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="5dp"
+                    android:layout_gravity="bottom"
+                    android:layout_marginBottom="-1.5dp"
+                    android:progressBackgroundTint="?attr/colorPrimary"
+                    android:progressTint="?attr/colorPrimary"
+                    tools:progress="50" />
             </androidx.cardview.widget.CardView>
 
             <LinearLayout
diff --git a/app/src/main/res/layout/search_result_grid.xml b/app/src/main/res/layout/search_result_grid.xml
index 155803b7c9a..19585fb0988 100644
--- a/app/src/main/res/layout/search_result_grid.xml
+++ b/app/src/main/res/layout/search_result_grid.xml
@@ -82,8 +82,8 @@
             android:layout_height="5dp"
             android:layout_gravity="bottom"
             android:layout_marginBottom="-1.5dp"
-            android:progressBackgroundTint="?attr/white"
-            android:progressTint="?attr/white"
+            android:progressBackgroundTint="?attr/colorPrimary"
+            android:progressTint="?attr/colorPrimary"
             android:visibility="gone"
             tools:progress="50"
             tools:visibility="visible" />
diff --git a/app/src/main/res/layout/search_result_grid_expanded.xml b/app/src/main/res/layout/search_result_grid_expanded.xml
index b43d3b85268..41d58bbb175 100644
--- a/app/src/main/res/layout/search_result_grid_expanded.xml
+++ b/app/src/main/res/layout/search_result_grid_expanded.xml
@@ -93,8 +93,8 @@
                 android:layout_height="5dp"
                 android:layout_gravity="bottom"
                 android:layout_marginBottom="-1.5dp"
-                android:progressBackgroundTint="?attr/white"
-                android:progressTint="?attr/white"
+                android:progressBackgroundTint="?attr/colorPrimary"
+                android:progressTint="?attr/colorPrimary"
                 android:visibility="gone"
                 tools:progress="50"
                 tools:visibility="visible" />
@@ -130,4 +130,4 @@
         android:textSize="13sp"
         tools:text="The Perfect Run\nThe Perfect Run" />
 
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 48b69232abe..1864ff5b907 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -121,5 +121,4 @@
     <color name="colorTestPass">#48E484</color>
     <color name="colorTestFail">#ea596e</color>
     <color name="colorTestWarning">#FF9800</color>
-    <color name="playIconBackground">#B3000000</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index b0c150000b5..bf75ed44108 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -26,10 +26,4 @@
 
     <dimen name="account_select_linear_item_size">100dp</dimen>
     <dimen name="dialog_buttons_inset">5dp</dimen>
-
-    <dimen name="home_poster_progress_size">50dp</dimen>
-    <dimen name="episode_progress_size">40dp</dimen>
-    <dimen name="continue_watching_progress_size">25dp</dimen>
-    <dimen name="circular_progress_thickness">2dp</dimen>
-    <dimen name="download_header_progress_size">35dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f386bb62eff..67ab9de0edc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1054,75 +1054,4 @@
             @drawable/cast_ic_mini_controller_closed_caption
         </item>
     </style>
-
-    <style name="RoundedImageView">
-        <item name="cornerFamily">rounded</item>
-        <item name="cornerSize">50%</item>
-    </style>
-
-    <style name="PlayUnderlayProgress">
-        <item name="shapeAppearanceOverlay">@style/RoundedImageView</item>
-        <item name="android:scaleType">center</item>
-        <item name="android:src">@drawable/netflix_play</item>
-        <item name="android:layout_gravity">center</item>
-    </style>
-
-    <style name="CircularProgress">
-        <item name="trackThickness">@dimen/circular_progress_thickness</item>
-        <item name="android:layout_gravity">center</item>
-        <item name="indicatorColor">@color/white</item>
-        <item name="indicatorTrackGapSize">0dp</item>
-        <item name="trackColor">@color/white_attr_20</item>
-    </style>
-
-    <style name="HomePlayUnderlayProgress" parent="PlayUnderlayProgress">
-        <item name="tint">@color/white</item>
-        <item name="android:layout_width">@dimen/home_poster_progress_size</item>
-        <item name="android:layout_height">@dimen/home_poster_progress_size</item>
-        <item name="android:background">@color/playIconBackground</item>
-    </style>
-
-    <style name="HomeCircularProgress" parent="CircularProgress">
-        <item name="android:layout_width">@dimen/home_poster_progress_size</item>
-        <item name="android:layout_height">@dimen/home_poster_progress_size</item>
-        <item name="indicatorSize">@dimen/home_poster_progress_size</item>
-    </style>
-
-    <style name="EpisodePlayUnderlayProgress" parent="PlayUnderlayProgress">
-        <item name="tint">@color/white</item>
-        <item name="android:layout_width">40dp</item>
-        <item name="android:layout_height">40dp</item>
-        <item name="android:background">@color/playIconBackground</item>
-    </style>
-
-    <style name="EpisodeCircularProgress" parent="CircularProgress">
-        <item name="android:layout_width">@dimen/episode_progress_size</item>
-        <item name="android:layout_height">@dimen/episode_progress_size</item>
-        <item name="indicatorSize">@dimen/episode_progress_size</item>
-    </style>
-
-    <style name="ContinueWatchingPlayUnderlayProgress">
-        <item name="android:layout_width">@dimen/continue_watching_progress_size</item>
-        <item name="android:layout_height">@dimen/continue_watching_progress_size</item>
-        <item name="android:src">@drawable/play_button_transparent</item>
-        <item name="android:layout_gravity">center</item>
-    </style>
-
-    <style name="ContinueWatchingCircularProgress" parent="CircularProgress">
-        <item name="android:layout_width">@dimen/continue_watching_progress_size</item>
-        <item name="android:layout_height">@dimen/continue_watching_progress_size</item>
-        <item name="indicatorSize">@dimen/continue_watching_progress_size</item>
-    </style>
-
-    <style name="DownloadHeaderCircularProgress" parent="CircularProgress">
-        <item name="android:layout_width">@dimen/download_header_progress_size</item>
-        <item name="android:layout_height">@dimen/download_header_progress_size</item>
-        <item name="indicatorSize">@dimen/download_header_progress_size</item>
-    </style>
-    <style name="DownloadHeaderPlayUnderlayProgress" parent="PlayUnderlayProgress">
-        <item name="tint">@color/white</item>
-        <item name="android:layout_width">@dimen/download_header_progress_size</item>
-        <item name="android:layout_height">@dimen/download_header_progress_size</item>
-        <item name="android:background">@color/playIconBackground</item>
-    </style>
 </resources>