diff --git a/app/src/main/res/layout/playlist_row.xml b/app/src/main/res/layout/playlist_row.xml
index b0c4e6095..cca5c2238 100644
--- a/app/src/main/res/layout/playlist_row.xml
+++ b/app/src/main/res/layout/playlist_row.xml
@@ -2,12 +2,12 @@
 <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/video_search"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="8dp"
     android:layout_marginBottom="16dp"
-    android:background="?android:attr/selectableItemBackground"
-    android:id="@+id/video_search">
+    android:background="?android:attr/selectableItemBackground">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
@@ -18,17 +18,17 @@
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/card_search_thumbnail"
-        app:cardCornerRadius="8dp"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:strokeWidth="0dp"
+        app:cardCornerRadius="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="16:9"
+        app:layout_constraintEnd_toStartOf="@+id/guideline"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0"
-        app:layout_constraintEnd_toStartOf="@+id/guideline">
+        app:strokeWidth="0dp">
 
         <ImageView
             android:id="@+id/playlist_thumbnail"
@@ -36,15 +36,27 @@
             android:layout_height="match_parent"
             tools:srcCompat="@tools:sample/backgrounds/scenic" />
 
-        <TextView
-            android:id="@+id/playlist_duration"
+        <androidx.cardview.widget.CardView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_margin="5dp"
-            android:textColor="@color/duration_text_color"
-            android:background="@color/duration_background_color"
-            android:padding="0.5dp" />
+            app:cardBackgroundColor="@color/duration_background_color"
+            app:cardCornerRadius="8dp"
+            app:cardElevation="0dp">
+
+            <TextView
+                android:id="@+id/playlist_duration"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="6dp"
+                android:paddingTop="2dp"
+                android:paddingEnd="6dp"
+                android:paddingBottom="2dp"
+                android:textColor="@color/duration_text_color"
+                tools:text="05:36" />
+
+        </androidx.cardview.widget.CardView>
     </com.google.android.material.card.MaterialCardView>
 
     <TextView
@@ -71,11 +83,11 @@
         android:id="@+id/delete_playlist"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:shapeAppearanceOverlay="@style/roundedImageViewRounded"
-        android:src="@drawable/ic_delete"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         android:background="?android:attr/selectableItemBackground"
         android:padding="8dp"
-        android:visibility="gone" />
+        android:src="@drawable/ic_delete"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/roundedImageViewRounded" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/trending_row.xml b/app/src/main/res/layout/trending_row.xml
index 72260e2ed..c62ad6cb9 100644
--- a/app/src/main/res/layout/trending_row.xml
+++ b/app/src/main/res/layout/trending_row.xml
@@ -1,10 +1,10 @@
 <?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:layout_width="match_parent"
-    android:background="?android:attr/selectableItemBackground"
-
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground">
 
     <androidx.cardview.widget.CardView
         android:id="@+id/thumbnailcard"
@@ -13,28 +13,41 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
+        android:elevation="10dp"
+        app:cardCornerRadius="8dp"
         app:layout_constraintDimensionRatio="16:9"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:cardCornerRadius="8dp"
-        android:elevation="10dp">
+        app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
             android:id="@+id/thumbnail"
-            android:src="@mipmap/ic_launcher"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            android:src="@mipmap/ic_launcher" />
 
-        <TextView
-            android:id="@+id/thumbnail_duration"
+        <androidx.cardview.widget.CardView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_margin="5dp"
-            android:textColor="@color/duration_text_color"
-            android:background="@color/duration_background_color"
-            android:padding="0.5dp" />
+            app:cardBackgroundColor="@color/duration_background_color"
+            app:cardCornerRadius="8dp"
+            app:cardElevation="0dp">
+
+            <TextView
+                android:id="@+id/thumbnail_duration"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="6dp"
+                android:paddingTop="2dp"
+                android:paddingEnd="6dp"
+                android:paddingBottom="2dp"
+                android:textColor="@color/duration_text_color"
+                tools:text="05:36" />
+
+        </androidx.cardview.widget.CardView>
+
     </androidx.cardview.widget.CardView>
 
 
@@ -45,24 +58,24 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
+        android:ellipsize="end"
+        android:maxLines="2"
         android:text="Title"
         android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="@+id/thumbnailcard"
         app:layout_constraintStart_toEndOf="@+id/channel_image"
-        app:layout_constraintTop_toBottomOf="@+id/thumbnailcard"
-        android:ellipsize="end"
-        android:maxLines="2" />
+        app:layout_constraintTop_toBottomOf="@+id/thumbnailcard" />
 
     <TextView
         android:id="@+id/textView_channel"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:paddingBottom="16dp"
         android:text="Channel Name"
         app:layout_constraintEnd_toEndOf="@+id/textView_title"
         app:layout_constraintStart_toStartOf="@+id/textView_title"
-        app:layout_constraintTop_toBottomOf="@+id/textView_title"
-        android:paddingBottom="16dp" />
+        app:layout_constraintTop_toBottomOf="@+id/textView_title" />
 
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/channel_image"
diff --git a/app/src/main/res/layout/video_channel_row.xml b/app/src/main/res/layout/video_channel_row.xml
index 6536befd9..d09f8a5f3 100644
--- a/app/src/main/res/layout/video_channel_row.xml
+++ b/app/src/main/res/layout/video_channel_row.xml
@@ -2,11 +2,11 @@
 <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/video_search"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="16dp"
-    android:background="?android:attr/selectableItemBackground"
-    android:id="@+id/video_search">
+    android:background="?android:attr/selectableItemBackground">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
@@ -17,17 +17,17 @@
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/card_search_thumbnail"
-        app:cardCornerRadius="8dp"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:strokeWidth="0dp"
+        app:cardCornerRadius="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="16:9"
+        app:layout_constraintEnd_toStartOf="@+id/guideline"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0"
-        app:layout_constraintEnd_toStartOf="@+id/guideline">
+        app:strokeWidth="0dp">
 
         <ImageView
             android:id="@+id/channel_thumbnail"
@@ -35,15 +35,28 @@
             android:layout_height="match_parent"
             tools:srcCompat="@tools:sample/backgrounds/scenic" />
 
-        <TextView
-            android:id="@+id/channel_duration"
+        <androidx.cardview.widget.CardView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_margin="5dp"
-            android:textColor="@color/duration_text_color"
-            android:background="@color/duration_background_color"
-            android:padding="0.5dp" />
+            app:cardBackgroundColor="@color/duration_background_color"
+            app:cardCornerRadius="8dp"
+            app:cardElevation="0dp">
+
+            <TextView
+                android:id="@+id/channel_duration"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="6dp"
+                android:paddingTop="2dp"
+                android:paddingEnd="6dp"
+                android:paddingBottom="2dp"
+                android:textColor="@color/duration_text_color"
+                tools:text="05:36" />
+
+        </androidx.cardview.widget.CardView>
+
     </com.google.android.material.card.MaterialCardView>
 
     <TextView
diff --git a/app/src/main/res/layout/video_search_row.xml b/app/src/main/res/layout/video_search_row.xml
index 84eb2cf8d..8d504f433 100644
--- a/app/src/main/res/layout/video_search_row.xml
+++ b/app/src/main/res/layout/video_search_row.xml
@@ -2,11 +2,11 @@
 <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/video_search"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="16dp"
-    android:background="?android:attr/selectableItemBackground"
-    android:id="@+id/video_search">
+    android:background="?android:attr/selectableItemBackground">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
@@ -17,17 +17,17 @@
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/card_search_thumbnail"
-        app:cardCornerRadius="8dp"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:strokeWidth="0dp"
+        app:cardCornerRadius="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="16:9"
+        app:layout_constraintEnd_toStartOf="@+id/guideline"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0"
-        app:layout_constraintEnd_toStartOf="@+id/guideline">
+        app:strokeWidth="0dp">
 
         <ImageView
             android:id="@+id/search_thumbnail"
@@ -35,17 +35,30 @@
             android:layout_height="match_parent"
             tools:srcCompat="@tools:sample/backgrounds/scenic" />
 
-        <TextView
-            android:id="@+id/search_thumbnail_duration"
+        <androidx.cardview.widget.CardView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
-            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
             android:layout_marginBottom="3dp"
-            android:textSize="11dp"
-            android:textColor="@color/duration_text_color"
-            android:background="@color/duration_background_color"
-            android:padding="0.5dp" />
+            app:cardBackgroundColor="@color/duration_background_color"
+            app:cardCornerRadius="8dp"
+            app:cardElevation="0dp">
+
+            <TextView
+                android:id="@+id/search_thumbnail_duration"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="6dp"
+                android:paddingTop="2dp"
+                android:paddingEnd="6dp"
+                android:paddingBottom="2dp"
+                android:textColor="@color/duration_text_color"
+                android:textSize="11sp"
+                tools:text="05:36" />
+
+        </androidx.cardview.widget.CardView>
+
     </com.google.android.material.card.MaterialCardView>
 
     <TextView
@@ -53,9 +66,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:maxLines="2"
         android:ellipsize="end"
+        android:maxLines="2"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/card_search_thumbnail"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -83,9 +96,9 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginTop="12dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:maxLines="1"
         android:ellipsize="end"
+        android:maxLines="1"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/search_channel_image"
         app:layout_constraintTop_toBottomOf="@+id/search_views" />