diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java
index 68f19ee97..d959c6327 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java
@@ -13,8 +13,7 @@ import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.info_list.holder.ChannelInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelMiniInfoItemHolder;
-import org.schabi.newpipe.info_list.holder.CommentsInfoItemHolder;
-import org.schabi.newpipe.info_list.holder.CommentsMiniInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.CommentInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.InfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistMiniInfoItemHolder;
@@ -87,8 +86,7 @@ public class InfoItemBuilder {
                 return useMiniVariant ? new PlaylistMiniInfoItemHolder(this, parent)
                         : new PlaylistInfoItemHolder(this, parent);
             case COMMENT:
-                return useMiniVariant ? new CommentsMiniInfoItemHolder(this, parent)
-                        : new CommentsInfoItemHolder(this, parent);
+                return new CommentInfoItemHolder(this, parent);
             default:
                 throw new RuntimeException("InfoType not expected = " + infoType.name());
         }
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
index a13f0e5aa..575568c00 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
@@ -21,8 +21,7 @@ import org.schabi.newpipe.info_list.holder.ChannelCardInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelMiniInfoItemHolder;
-import org.schabi.newpipe.info_list.holder.CommentsInfoItemHolder;
-import org.schabi.newpipe.info_list.holder.CommentsMiniInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.CommentInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.InfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistCardInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistGridInfoItemHolder;
@@ -79,8 +78,7 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     private static final int PLAYLIST_HOLDER_TYPE = 0x301;
     private static final int GRID_PLAYLIST_HOLDER_TYPE = 0x302;
     private static final int CARD_PLAYLIST_HOLDER_TYPE = 0x303;
-    private static final int MINI_COMMENT_HOLDER_TYPE = 0x400;
-    private static final int COMMENT_HOLDER_TYPE = 0x401;
+    private static final int COMMENT_HOLDER_TYPE = 0x400;
 
     private final LayoutInflater layoutInflater;
     private final InfoItemBuilder infoItemBuilder;
@@ -271,7 +269,7 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                     return PLAYLIST_HOLDER_TYPE;
                 }
             case COMMENT:
-                return useMiniVariant ? MINI_COMMENT_HOLDER_TYPE : COMMENT_HOLDER_TYPE;
+                return COMMENT_HOLDER_TYPE;
             default:
                 return -1;
         }
@@ -320,10 +318,8 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                 return new PlaylistGridInfoItemHolder(infoItemBuilder, parent);
             case CARD_PLAYLIST_HOLDER_TYPE:
                 return new PlaylistCardInfoItemHolder(infoItemBuilder, parent);
-            case MINI_COMMENT_HOLDER_TYPE:
-                return new CommentsMiniInfoItemHolder(infoItemBuilder, parent);
             case COMMENT_HOLDER_TYPE:
-                return new CommentsInfoItemHolder(infoItemBuilder, parent);
+                return new CommentInfoItemHolder(infoItemBuilder, parent);
             default:
                 return new FallbackViewHolder(new View(parent.getContext()));
         }
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentInfoItemHolder.java
similarity index 90%
rename from app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
rename to app/src/main/java/org/schabi/newpipe/info_list/holder/CommentInfoItemHolder.java
index d6a08e6cb..afe641c18 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentInfoItemHolder.java
@@ -41,8 +41,8 @@ import java.util.function.Consumer;
 
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
-public class CommentsMiniInfoItemHolder extends InfoItemHolder {
-    private static final String TAG = "CommentsMiniIIHolder";
+public class CommentInfoItemHolder extends InfoItemHolder {
+    private static final String TAG = "CommentIIHolder";
     private static final String ELLIPSIS = "…";
 
     private static final int COMMENT_DEFAULT_LINES = 2;
@@ -58,22 +58,26 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
     private final ImageView itemThumbnailView;
     private final TextView itemContentView;
     private final TextView itemLikesCountView;
-    private final TextView itemPublishedTime;
+    private final TextView itemTitleView;
+    private final ImageView itemHeartView;
+    private final ImageView itemPinnedView;
 
     private final CompositeDisposable disposables = new CompositeDisposable();
     @Nullable private Description commentText;
     @Nullable private StreamingService streamService;
     @Nullable private String streamUrl;
 
-    CommentsMiniInfoItemHolder(final InfoItemBuilder infoItemBuilder, final int layoutId,
-                               final ViewGroup parent) {
-        super(infoItemBuilder, layoutId, parent);
+    public CommentInfoItemHolder(final InfoItemBuilder infoItemBuilder,
+                                 final ViewGroup parent) {
+        super(infoItemBuilder, R.layout.list_comment_item, parent);
 
         itemRoot = itemView.findViewById(R.id.itemRoot);
         itemThumbnailView = itemView.findViewById(R.id.itemThumbnailView);
-        itemLikesCountView = itemView.findViewById(R.id.detail_thumbs_up_count_view);
-        itemPublishedTime = itemView.findViewById(R.id.itemPublishedTime);
         itemContentView = itemView.findViewById(R.id.itemCommentContentView);
+        itemLikesCountView = itemView.findViewById(R.id.detail_thumbs_up_count_view);
+        itemTitleView = itemView.findViewById(R.id.itemTitleView);
+        itemHeartView = itemView.findViewById(R.id.detail_heart_image_view);
+        itemPinnedView = itemView.findViewById(R.id.detail_pinned_view);
 
         commentHorizontalPadding = (int) infoItemBuilder.getContext()
                 .getResources().getDimension(R.dimen.comments_horizontal_padding);
@@ -85,11 +89,6 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
         ellipsisWidthPx = paintAtContentSize.measureText(ELLIPSIS);
     }
 
-    public CommentsMiniInfoItemHolder(final InfoItemBuilder infoItemBuilder,
-                                      final ViewGroup parent) {
-        this(infoItemBuilder, R.layout.list_comments_mini_item, parent);
-    }
-
     @Override
     public void updateFromItem(final InfoItem infoItem,
                                final HistoryRecordManager historyRecordManager) {
@@ -108,10 +107,19 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
             itemRoot.setPadding(commentHorizontalPadding, commentVerticalPadding,
                     commentHorizontalPadding, commentVerticalPadding);
         }
-
-
         itemThumbnailView.setOnClickListener(view -> openCommentAuthor(item));
 
+        final String uploadDate;
+        if (item.getUploadDate() != null) {
+            uploadDate = Localization.relativeTime(item.getUploadDate().offsetDateTime());
+        } else {
+            uploadDate = item.getTextualUploadDate();
+        }
+        itemTitleView.setText(Localization.concatenateStrings(item.getUploaderName(), uploadDate));
+
+        itemPinnedView.setVisibility(item.isPinned() ? View.VISIBLE : View.GONE);
+        itemHeartView.setVisibility(item.isHeartedByUploader() ? View.VISIBLE : View.GONE);
+
         try {
             streamService = NewPipe.getService(item.getServiceId());
         } catch (final ExtractionException e) {
@@ -136,12 +144,6 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
             itemLikesCountView.setText("-");
         }
 
-        if (item.getUploadDate() != null) {
-            itemPublishedTime.setText(Localization.relativeTime(item.getUploadDate()
-                    .offsetDateTime()));
-        } else {
-            itemPublishedTime.setText(item.getTextualUploadDate());
-        }
 
         itemView.setOnClickListener(view -> {
             toggleEllipsize();
@@ -150,7 +152,6 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
             }
         });
 
-
         itemView.setOnLongClickListener(view -> {
             if (DeviceUtils.isTv(itemBuilder.getContext())) {
                 openCommentAuthor(item);
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsInfoItemHolder.java
deleted file mode 100644
index 4fc2d9f84..000000000
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsInfoItemHolder.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.schabi.newpipe.info_list.holder;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.InfoItem;
-import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
-import org.schabi.newpipe.info_list.InfoItemBuilder;
-import org.schabi.newpipe.local.history.HistoryRecordManager;
-
-/*
- * Created by Christian Schabesberger on 12.02.17.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * ChannelInfoItemHolder .java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class CommentsInfoItemHolder extends CommentsMiniInfoItemHolder {
-    public final TextView itemTitleView;
-    private final ImageView itemHeartView;
-    private final ImageView itemPinnedView;
-
-    public CommentsInfoItemHolder(final InfoItemBuilder infoItemBuilder, final ViewGroup parent) {
-        super(infoItemBuilder, R.layout.list_comments_item, parent);
-
-        itemTitleView = itemView.findViewById(R.id.itemTitleView);
-        itemHeartView = itemView.findViewById(R.id.detail_heart_image_view);
-        itemPinnedView = itemView.findViewById(R.id.detail_pinned_view);
-    }
-
-    @Override
-    public void updateFromItem(final InfoItem infoItem,
-                               final HistoryRecordManager historyRecordManager) {
-        super.updateFromItem(infoItem, historyRecordManager);
-
-        if (!(infoItem instanceof CommentsInfoItem)) {
-            return;
-        }
-        final CommentsInfoItem item = (CommentsInfoItem) infoItem;
-
-        itemTitleView.setText(item.getUploaderName());
-
-        itemHeartView.setVisibility(item.isHeartedByUploader() ? View.VISIBLE : View.GONE);
-
-        itemPinnedView.setVisibility(item.isPinned() ? View.VISIBLE : View.GONE);
-    }
-}
diff --git a/app/src/main/res/layout/fragment_comments.xml b/app/src/main/res/layout/fragment_comments.xml
index b1b644d8c..2a8c747cd 100644
--- a/app/src/main/res/layout/fragment_comments.xml
+++ b/app/src/main/res/layout/fragment_comments.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
-        tools:listitem="@layout/list_comments_item" />
+        tools:listitem="@layout/list_comment_item" />
 
     <ProgressBar
         android:id="@+id/loading_progress_bar"
diff --git a/app/src/main/res/layout/list_comments_item.xml b/app/src/main/res/layout/list_comment_item.xml
similarity index 89%
rename from app/src/main/res/layout/list_comments_item.xml
rename to app/src/main/res/layout/list_comment_item.xml
index ad73c5ff4..26fcc9727 100644
--- a/app/src/main/res/layout/list_comments_item.xml
+++ b/app/src/main/res/layout/list_comment_item.xml
@@ -47,7 +47,7 @@
         android:lines="1"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="@dimen/comment_item_title_text_size"
-        tools:text="Author Name, Lorem ipsum" />
+        tools:text="Author Name, Lorem ipsum · 5 months ago" />
 
     <org.schabi.newpipe.views.NewPipeTextView
         android:id="@+id/itemCommentContentView"
@@ -96,16 +96,4 @@
         android:visibility="gone"
         tools:visibility="visible" />
 
-    <org.schabi.newpipe.views.NewPipeTextView
-        android:id="@+id/itemPublishedTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/itemCommentContentView"
-        android:layout_marginLeft="12dp"
-        android:layout_toRightOf="@id/detail_heart_image_view"
-        android:lines="1"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="@dimen/video_item_search_upload_date_text_size"
-        tools:text="1 year ago" />
-
 </RelativeLayout>
diff --git a/app/src/main/res/layout/list_comments_mini_item.xml b/app/src/main/res/layout/list_comments_mini_item.xml
deleted file mode 100644
index 606a237c5..000000000
--- a/app/src/main/res/layout/list_comments_mini_item.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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/itemRoot"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:clickable="true"
-    android:focusable="true"
-    android:padding="@dimen/video_item_search_padding">
-
-    <com.google.android.material.imageview.ShapeableImageView
-        android:id="@+id/itemThumbnailView"
-        android:layout_width="42dp"
-        android:layout_height="42dp"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="3dp"
-        android:layout_marginRight="15dp"
-        android:src="@drawable/placeholder_person"
-        app:shapeAppearance="@style/CircularImageView"
-        tools:ignore="RtlHardcoded" />
-
-
-    <org.schabi.newpipe.views.NewPipeTextView
-        android:id="@+id/itemCommentContentView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/channel_item_description_to_details_margin"
-        android:layout_toRightOf="@+id/itemThumbnailView"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="@dimen/comment_item_content_text_size"
-        tools:text="Channel description, Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blandit" />
-
-    <ImageView
-        android:id="@+id/detail_thumbs_up_img_view"
-        android:layout_width="@dimen/video_item_detail_like_image_width"
-        android:layout_height="@dimen/video_item_detail_like_image_height"
-        android:layout_below="@id/itemCommentContentView"
-        android:layout_toRightOf="@+id/itemThumbnailView"
-        android:contentDescription="@string/detail_likes_img_view_description"
-        android:src="@drawable/ic_thumb_up" />
-
-    <org.schabi.newpipe.views.NewPipeTextView
-        android:id="@+id/detail_thumbs_up_count_view"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/video_item_detail_like_image_height"
-        android:layout_below="@id/itemCommentContentView"
-        android:layout_marginLeft="@dimen/video_item_detail_like_margin"
-        android:layout_toRightOf="@id/detail_thumbs_up_img_view"
-        android:lines="1"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="@dimen/video_item_detail_likes_text_size"
-        tools:ignore="RtlHardcoded"
-        tools:text="12M" />
-
-    <org.schabi.newpipe.views.NewPipeTextView
-        android:id="@+id/itemPublishedTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/itemCommentContentView"
-        android:layout_marginLeft="12dp"
-        android:layout_toRightOf="@id/detail_thumbs_up_count_view"
-        android:lines="1"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="@dimen/video_item_search_upload_date_text_size"
-        tools:text="1 year ago" />
-
-</RelativeLayout>