diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentInfoItemHolder.java
index 839aa1813f3..ab643735344 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentInfoItemHolder.java
@@ -3,9 +3,13 @@
 import static org.schabi.newpipe.util.ServiceHelper.getServiceById;
 import static org.schabi.newpipe.util.text.TouchUtils.getOffsetForHorizontalLine;
 
+import android.graphics.Typeface;
+import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
+import android.text.style.StyleSpan;
 import android.text.style.URLSpan;
 import android.view.MotionEvent;
 import android.view.View;
@@ -87,7 +91,6 @@ public void updateFromItem(final InfoItem infoItem,
         }
         final CommentsInfoItem item = (CommentsInfoItem) infoItem;
 
-
         // load the author avatar
         PicassoHelper.loadAvatar(item.getUploaderAvatars()).into(itemThumbnailView);
         if (ImageStrategy.shouldLoadImages()) {
@@ -101,13 +104,12 @@ public void updateFromItem(final InfoItem infoItem,
         }
         itemThumbnailView.setOnClickListener(view -> openCommentAuthor(item));
 
-
         // setup the top row, with pinned icon, author name and comment date
         itemPinnedView.setVisibility(item.isPinned() ? View.VISIBLE : View.GONE);
-        itemTitleView.setText(Localization.concatenateStrings(item.getUploaderName(),
+        final String title = Localization.concatenateStrings(item.getUploaderName(),
                 Localization.relativeTimeOrTextual(itemBuilder.getContext(), item.getUploadDate(),
-                        item.getTextualUploadDate())));
-
+                        item.getTextualUploadDate()));
+        itemTitleView.setText(setTitleTextSpans(title));
 
         // setup bottom row, with likes, heart and replies button
         itemLikesCountView.setText(
@@ -123,7 +125,6 @@ public void updateFromItem(final InfoItem infoItem,
         ((RelativeLayout.LayoutParams) itemThumbsUpView.getLayoutParams()).topMargin =
                 hasReplies ? 0 : DeviceUtils.dpToPx(6, itemBuilder.getContext());
 
-
         // setup comment content and click listeners to expand/ellipsize it
         textEllipsizer.setStreamingService(getServiceById(item.getServiceId()));
         textEllipsizer.setStreamUrl(item.getUrl());
@@ -190,6 +191,13 @@ private void denyLinkFocus() {
         itemContentView.setMovementMethod(null);
     }
 
+    private Spannable setTitleTextSpans(final String title) {
+        final Spannable spannable = new SpannableString(title);
+        final int index = title.indexOf(" ");
+        spannable.setSpan(new StyleSpan(Typeface.BOLD), 0, index, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        return spannable;
+    }
+
     private boolean shouldFocusLinks() {
         if (itemView.isInTouchMode()) {
             return false;
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index 1a4711581e2..a75104a8e4a 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -178,6 +178,7 @@
                         android:paddingBottom="8dp"
                         android:textAppearance="?android:attr/textAppearanceLarge"
                         android:textSize="@dimen/video_item_detail_title_text_size"
+                        android:textStyle="bold"
                         tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum. Nunc eleifend est quis ipsum porttitor egestas. Sed facilisis, nisl quis eleifend pellentesque, orci metus egestas dolor, at accumsan eros metus quis libero." />
 
                     <ImageView
diff --git a/app/src/main/res/layout/list_comment_item.xml b/app/src/main/res/layout/list_comment_item.xml
index 631ab204b3f..fa34986e10e 100644
--- a/app/src/main/res/layout/list_comment_item.xml
+++ b/app/src/main/res/layout/list_comment_item.xml
@@ -63,6 +63,7 @@
         android:layout_alignBottom="@+id/replies_button"
         android:layout_toEndOf="@+id/itemThumbnailView"
         android:contentDescription="@string/detail_likes_img_view_description"
+        android:layout_marginStart="2dp"
         android:src="@drawable/ic_thumb_up" />
 
     <org.schabi.newpipe.views.NewPipeTextView
@@ -99,6 +100,7 @@
         android:layout_alignParentEnd="true"
         android:layout_marginStart="@dimen/video_item_detail_heart_margin"
         android:minHeight="0dp"
+        android:textAllCaps="false"
         tools:text="543 replies" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/list_stream_card_item.xml b/app/src/main/res/layout/list_stream_card_item.xml
index 968dca08267..478c74117b2 100644
--- a/app/src/main/res/layout/list_stream_card_item.xml
+++ b/app/src/main/res/layout/list_stream_card_item.xml
@@ -5,11 +5,11 @@
     android:id="@+id/itemRoot"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@dimen/channel_item_grid_padding"
-    android:paddingBottom="@dimen/channel_item_grid_padding"
+    android:padding="@dimen/channel_item_grid_padding"
     android:background="?attr/selectableItemBackground"
     android:clickable="true"
-    android:focusable="true">
+    android:focusable="true"
+    android:paddingBottom="@dimen/channel_item_grid_padding">
 
     <ImageView
         android:id="@+id/itemThumbnailView"
@@ -46,12 +46,11 @@
         android:id="@+id/itemVideoTitleView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/margin_small"
-        android:layout_marginEnd="@dimen/margin_small"
+        android:layout_marginTop="@dimen/margin_small"
         android:ellipsize="end"
         android:maxLines="2"
-        android:layout_marginTop="@dimen/margin_small"
         android:textAppearance="?textAppearanceListItem"
+        android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="@id/itemThumbnailView"
         app:layout_constraintStart_toStartOf="@id/itemThumbnailView"
         app:layout_constraintTop_toBottomOf="@id/itemThumbnailView"
@@ -64,9 +63,10 @@
         android:layout_marginTop="@dimen/spacing_micro"
         android:layout_marginEnd="@dimen/margin_small"
         android:ellipsize="end"
-        android:lines="1"
         android:includeFontPadding="false"
+        android:lines="1"
         android:textAppearance="?android:textAppearanceSmall"
+        android:textStyle="italic"
         app:layout_constraintEnd_toStartOf="@id/itemAdditionalDetails"
         app:layout_constraintStart_toStartOf="@id/itemVideoTitleView"
         app:layout_constraintTop_toBottomOf="@+id/itemVideoTitleView"
@@ -77,8 +77,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:ellipsize="end"
-        android:lines="1"
         android:includeFontPadding="false"
+        android:lines="1"
         android:textAppearance="?android:textAppearanceSmall"
         app:layout_constraintBottom_toBottomOf="@id/itemUploaderView"
         app:layout_constraintEnd_toEndOf="@+id/itemVideoTitleView"
diff --git a/app/src/main/res/layout/list_stream_grid_item.xml b/app/src/main/res/layout/list_stream_grid_item.xml
index 9d5636f48d2..7aa2d6cc2f1 100644
--- a/app/src/main/res/layout/list_stream_grid_item.xml
+++ b/app/src/main/res/layout/list_stream_grid_item.xml
@@ -12,9 +12,10 @@
 
     <ImageView
         android:id="@+id/itemThumbnailView"
-        android:layout_width="@dimen/video_item_grid_thumbnail_image_width"
-        android:layout_height="@dimen/video_item_grid_thumbnail_image_height"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         android:scaleType="fitCenter"
+        app:layout_constraintDimensionRatio="16:9"
         android:src="@drawable/placeholder_thumbnail_video"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -47,6 +48,8 @@
         android:maxLines="2"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textSize="@dimen/video_item_search_title_text_size"
+        android:textStyle="bold"
+        android:layout_marginTop="6dp"
         app:layout_constraintBottom_toTopOf="@+id/itemUploaderView"
         app:layout_constraintEnd_toEndOf="@+id/itemThumbnailView"
         app:layout_constraintStart_toStartOf="@+id/itemThumbnailView"
@@ -61,6 +64,7 @@
         android:lines="1"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="@dimen/video_item_search_uploader_text_size"
+        android:textStyle="italic"
         app:layout_constraintBottom_toTopOf="@+id/itemAdditionalDetails"
         app:layout_constraintEnd_toEndOf="@+id/itemThumbnailView"
         app:layout_constraintStart_toStartOf="@+id/itemThumbnailView"
diff --git a/app/src/main/res/layout/list_stream_item.xml b/app/src/main/res/layout/list_stream_item.xml
index 793942568e4..35524c39ab7 100644
--- a/app/src/main/res/layout/list_stream_item.xml
+++ b/app/src/main/res/layout/list_stream_item.xml
@@ -41,11 +41,13 @@
         android:id="@+id/itemVideoTitleView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/video_item_search_image_right_margin"
+        android:layout_marginStart="@dimen/video_item_search_padding"
+        android:layout_marginTop="4dp"
         android:ellipsize="end"
         android:maxLines="2"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textSize="@dimen/video_item_search_title_text_size"
+        android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/itemUploaderView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/itemThumbnailView"
@@ -60,6 +62,7 @@
         android:lines="1"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="@dimen/video_item_search_uploader_text_size"
+        android:textStyle="italic"
         app:layout_constraintBottom_toTopOf="@+id/itemAdditionalDetails"
         app:layout_constraintEnd_toEndOf="@+id/itemVideoTitleView"
         app:layout_constraintStart_toStartOf="@+id/itemVideoTitleView"
@@ -70,6 +73,7 @@
         android:id="@+id/itemAdditionalDetails"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
         android:ellipsize="end"
         android:lines="1"
         android:textAppearance="?android:attr/textAppearanceSmall"