diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java
index 0d0e784a..164b283e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java
@@ -360,7 +360,7 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
                 || viewType == VIEW_TYPE_POST_CARD_LINK_TYPE
                 || viewType == VIEW_TYPE_POST_CARD_NO_PREVIEW_LINK_TYPE
                 || viewType == VIEW_TYPE_POST_CARD_GALLERY_TYPE) {
-            return new PostGalleryTypeViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_post_gallery, parent, false));
+            return new PostWithPreviewTypeViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_post_with_preview, parent, false));
         } else if (viewType == VIEW_TYPE_POST_CARD_TEXT_TYPE) {
             return new PostTextTypeViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_post_text, parent, false));
         } else if (viewType == VIEW_TYPE_POST_COMPACT) {
@@ -607,41 +607,41 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
                     } else {
                         ((PostVideoAutoplayViewHolder) holder).bindVideoUri(Uri.parse(post.getVideoUrl()));
                     }
-                } else if (holder instanceof PostGalleryTypeViewHolder) {
+                } else if (holder instanceof PostWithPreviewTypeViewHolder) {
                     if (post.getPostType() == Post.VIDEO_TYPE) {
-                        ((PostGalleryTypeViewHolder) holder).videoOrGifIndicatorImageView.setVisibility(View.VISIBLE);
-                        ((PostGalleryTypeViewHolder) holder).typeTextView.setText(mActivity.getString(R.string.video));
+                        ((PostWithPreviewTypeViewHolder) holder).videoOrGifIndicatorImageView.setVisibility(View.VISIBLE);
+                        ((PostWithPreviewTypeViewHolder) holder).typeTextView.setText(mActivity.getString(R.string.video));
                     } else if (post.getPostType() == Post.GIF_TYPE) {
-                        ((PostGalleryTypeViewHolder) holder).videoOrGifIndicatorImageView.setVisibility(View.VISIBLE);
-                        ((PostGalleryTypeViewHolder) holder).typeTextView.setText(mActivity.getString(R.string.gif));
+                        ((PostWithPreviewTypeViewHolder) holder).videoOrGifIndicatorImageView.setVisibility(View.VISIBLE);
+                        ((PostWithPreviewTypeViewHolder) holder).typeTextView.setText(mActivity.getString(R.string.gif));
                     } else if (post.getPostType() == Post.IMAGE_TYPE) {
-                        ((PostGalleryTypeViewHolder) holder).typeTextView.setText(mActivity.getString(R.string.image));
+                        ((PostWithPreviewTypeViewHolder) holder).typeTextView.setText(mActivity.getString(R.string.image));
                     } else if (post.getPostType() == Post.LINK_TYPE || post.getPostType() == Post.NO_PREVIEW_LINK_TYPE) {
-                        ((PostGalleryTypeViewHolder) holder).typeTextView.setText(mActivity.getString(R.string.link));
-                        ((PostGalleryTypeViewHolder) holder).linkTextView.setVisibility(View.VISIBLE);
+                        ((PostWithPreviewTypeViewHolder) holder).typeTextView.setText(mActivity.getString(R.string.link));
+                        ((PostWithPreviewTypeViewHolder) holder).linkTextView.setVisibility(View.VISIBLE);
                         String domain = Uri.parse(post.getUrl()).getHost();
-                        ((PostGalleryTypeViewHolder) holder).linkTextView.setText(domain);
+                        ((PostWithPreviewTypeViewHolder) holder).linkTextView.setText(domain);
                     } else if (post.getPostType() == Post.GALLERY_TYPE) {
-                        ((PostGalleryTypeViewHolder) holder).typeTextView.setText(mActivity.getString(R.string.gallery));
+                        ((PostWithPreviewTypeViewHolder) holder).typeTextView.setText(mActivity.getString(R.string.gallery));
                     }
 
                     if (post.getPostType() != Post.NO_PREVIEW_LINK_TYPE) {
-                        ((PostGalleryTypeViewHolder) holder).progressBar.setVisibility(View.VISIBLE);
+                        ((PostWithPreviewTypeViewHolder) holder).progressBar.setVisibility(View.VISIBLE);
                     }
 
                     Post.Preview preview = getSuitablePreview(post.getPreviews());
                     if (preview != null) {
-                        ((PostGalleryTypeViewHolder) holder).imageWrapperRelativeLayout.setVisibility(View.VISIBLE);
+                        ((PostWithPreviewTypeViewHolder) holder).imageWrapperRelativeLayout.setVisibility(View.VISIBLE);
                         if (preview.getPreviewWidth() <= 0 || preview.getPreviewHeight() <= 0) {
-                            ((PostGalleryTypeViewHolder) holder).imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
-                            ((PostGalleryTypeViewHolder) holder).imageView.getLayoutParams().height = (int) (400 * mScale);
+                            ((PostWithPreviewTypeViewHolder) holder).imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+                            ((PostWithPreviewTypeViewHolder) holder).imageView.getLayoutParams().height = (int) (400 * mScale);
                         } else {
-                            ((PostGalleryTypeViewHolder) holder).imageView
+                            ((PostWithPreviewTypeViewHolder) holder).imageView
                                     .setRatio((float) preview.getPreviewHeight() / preview.getPreviewWidth());
                         }
                         loadImage(holder, post, preview);
                     } else {
-                        ((PostGalleryTypeViewHolder) holder).noPreviewLinkImageView.setVisibility(View.VISIBLE);
+                        ((PostWithPreviewTypeViewHolder) holder).noPreviewLinkImageView.setVisibility(View.VISIBLE);
                     }
                 } else if (holder instanceof PostTextTypeViewHolder) {
                     if (!post.isSpoiler() && post.getSelfTextPlainTrimmed() != null && !post.getSelfTextPlainTrimmed().equals("")) {
@@ -963,15 +963,15 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
 
     private void loadImage(final RecyclerView.ViewHolder holder, final Post post, @NonNull Post.Preview preview) {
         if (preview != null) {
-            if (holder instanceof PostGalleryTypeViewHolder) {
+            if (holder instanceof PostWithPreviewTypeViewHolder) {
                 RequestBuilder<Drawable> imageRequestBuilder = mGlide.load(preview.getPreviewUrl()).listener(new RequestListener<Drawable>() {
                     @Override
                     public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
-                        ((PostGalleryTypeViewHolder) holder).progressBar.setVisibility(View.GONE);
-                        ((PostGalleryTypeViewHolder) holder).errorRelativeLayout.setVisibility(View.VISIBLE);
-                        ((PostGalleryTypeViewHolder) holder).errorRelativeLayout.setOnClickListener(view -> {
-                            ((PostGalleryTypeViewHolder) holder).progressBar.setVisibility(View.VISIBLE);
-                            ((PostGalleryTypeViewHolder) holder).errorRelativeLayout.setVisibility(View.GONE);
+                        ((PostWithPreviewTypeViewHolder) holder).progressBar.setVisibility(View.GONE);
+                        ((PostWithPreviewTypeViewHolder) holder).errorRelativeLayout.setVisibility(View.VISIBLE);
+                        ((PostWithPreviewTypeViewHolder) holder).errorRelativeLayout.setOnClickListener(view -> {
+                            ((PostWithPreviewTypeViewHolder) holder).progressBar.setVisibility(View.VISIBLE);
+                            ((PostWithPreviewTypeViewHolder) holder).errorRelativeLayout.setVisibility(View.GONE);
                             loadImage(holder, post, preview);
                         });
                         return false;
@@ -979,20 +979,20 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
 
                     @Override
                     public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
-                        ((PostGalleryTypeViewHolder) holder).errorRelativeLayout.setVisibility(View.GONE);
-                        ((PostGalleryTypeViewHolder) holder).progressBar.setVisibility(View.GONE);
+                        ((PostWithPreviewTypeViewHolder) holder).errorRelativeLayout.setVisibility(View.GONE);
+                        ((PostWithPreviewTypeViewHolder) holder).progressBar.setVisibility(View.GONE);
                         return false;
                     }
                 });
 
                 if ((post.isNSFW() && mNeedBlurNSFW && !(post.getPostType() == Post.GIF_TYPE && mAutoplayNsfwVideos)) || post.isSpoiler() && mNeedBlurSpoiler) {
                     imageRequestBuilder.apply(RequestOptions.bitmapTransform(new BlurTransformation(50, 10)))
-                            .into(((PostGalleryTypeViewHolder) holder).imageView);
+                            .into(((PostWithPreviewTypeViewHolder) holder).imageView);
                 } else {
                     if (mImageViewWidth > preview.getPreviewWidth()) {
-                        imageRequestBuilder.override(Target.SIZE_ORIGINAL).into(((PostGalleryTypeViewHolder) holder).imageView);
+                        imageRequestBuilder.override(Target.SIZE_ORIGINAL).into(((PostWithPreviewTypeViewHolder) holder).imageView);
                     } else {
-                        imageRequestBuilder.into(((PostGalleryTypeViewHolder) holder).imageView);
+                        imageRequestBuilder.into(((PostWithPreviewTypeViewHolder) holder).imageView);
                     }
                 }
             } else if (holder instanceof PostCompactBaseViewHolder) {
@@ -1182,14 +1182,14 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
                 ((PostVideoAutoplayViewHolder) holder).resetVolume();
                 mGlide.clear(((PostVideoAutoplayViewHolder) holder).previewImageView);
                 ((PostVideoAutoplayViewHolder) holder).previewImageView.setVisibility(View.GONE);
-            } else if (holder instanceof PostGalleryTypeViewHolder) {
-                mGlide.clear(((PostGalleryTypeViewHolder) holder).imageView);
-                ((PostGalleryTypeViewHolder) holder).imageWrapperRelativeLayout.setVisibility(View.GONE);
-                ((PostGalleryTypeViewHolder) holder).errorRelativeLayout.setVisibility(View.GONE);
-                ((PostGalleryTypeViewHolder) holder).noPreviewLinkImageView.setVisibility(View.GONE);
-                ((PostGalleryTypeViewHolder) holder).progressBar.setVisibility(View.GONE);
-                ((PostGalleryTypeViewHolder) holder).videoOrGifIndicatorImageView.setVisibility(View.GONE);
-                ((PostGalleryTypeViewHolder) holder).linkTextView.setVisibility(View.GONE);
+            } else if (holder instanceof PostWithPreviewTypeViewHolder) {
+                mGlide.clear(((PostWithPreviewTypeViewHolder) holder).imageView);
+                ((PostWithPreviewTypeViewHolder) holder).imageWrapperRelativeLayout.setVisibility(View.GONE);
+                ((PostWithPreviewTypeViewHolder) holder).errorRelativeLayout.setVisibility(View.GONE);
+                ((PostWithPreviewTypeViewHolder) holder).noPreviewLinkImageView.setVisibility(View.GONE);
+                ((PostWithPreviewTypeViewHolder) holder).progressBar.setVisibility(View.GONE);
+                ((PostWithPreviewTypeViewHolder) holder).videoOrGifIndicatorImageView.setVisibility(View.GONE);
+                ((PostWithPreviewTypeViewHolder) holder).linkTextView.setVisibility(View.GONE);
             } else if (holder instanceof PostTextTypeViewHolder) {
                 ((PostTextTypeViewHolder) holder).contentTextView.setText("");
                 ((PostTextTypeViewHolder) holder).contentTextView.setVisibility(View.GONE);
@@ -1994,69 +1994,69 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
         }
     }
 
-    class PostGalleryTypeViewHolder extends PostBaseViewHolder {
-        @BindView(R.id.card_view_item_post_gallery_type)
+    class PostWithPreviewTypeViewHolder extends PostBaseViewHolder {
+        @BindView(R.id.card_view_item_post_with_preview)
         MaterialCardView cardView;
-        @BindView(R.id.icon_gif_image_view_item_post_gallery_type)
+        @BindView(R.id.icon_gif_image_view_item_post_with_preview)
         AspectRatioGifImageView iconGifImageView;
-        @BindView(R.id.subreddit_name_text_view_item_post_gallery_type)
+        @BindView(R.id.subreddit_name_text_view_item_post_with_preview)
         TextView subredditTextView;
-        @BindView(R.id.user_text_view_item_post_gallery_type)
+        @BindView(R.id.user_text_view_item_post_with_preview)
         TextView userTextView;
-        @BindView(R.id.stickied_post_image_view_item_post_gallery_type)
+        @BindView(R.id.stickied_post_image_view_item_post_with_preview)
         ImageView stickiedPostImageView;
-        @BindView(R.id.post_time_text_view_item_post_gallery_type)
+        @BindView(R.id.post_time_text_view_item_post_with_preview)
         TextView postTimeTextView;
-        @BindView(R.id.title_text_view_item_post_gallery_type)
+        @BindView(R.id.title_text_view_item_post_with_preview)
         TextView titleTextView;
-        @BindView(R.id.type_text_view_item_post_gallery_type)
+        @BindView(R.id.type_text_view_item_post_with_preview)
         CustomTextView typeTextView;
-        @BindView(R.id.archived_image_view_item_post_gallery_type)
+        @BindView(R.id.archived_image_view_item_post_with_preview)
         ImageView archivedImageView;
-        @BindView(R.id.locked_image_view_item_post_gallery_type)
+        @BindView(R.id.locked_image_view_item_post_with_preview)
         ImageView lockedImageView;
-        @BindView(R.id.crosspost_image_view_item_post_gallery_type)
+        @BindView(R.id.crosspost_image_view_item_post_with_preview)
         ImageView crosspostImageView;
-        @BindView(R.id.nsfw_text_view_item_post_gallery_type)
+        @BindView(R.id.nsfw_text_view_item_post_with_preview)
         CustomTextView nsfwTextView;
-        @BindView(R.id.spoiler_custom_text_view_item_post_gallery_type)
+        @BindView(R.id.spoiler_custom_text_view_item_post_with_preview)
         CustomTextView spoilerTextView;
-        @BindView(R.id.flair_custom_text_view_item_post_gallery_type)
+        @BindView(R.id.flair_custom_text_view_item_post_with_preview)
         CustomTextView flairTextView;
-        @BindView(R.id.awards_text_view_item_post_gallery_type)
+        @BindView(R.id.awards_text_view_item_post_with_preview)
         CustomTextView awardsTextView;
-        @BindView(R.id.link_text_view_item_post_gallery)
+        @BindView(R.id.link_text_view_item_post_with_preview)
         TextView linkTextView;
-        @BindView(R.id.video_or_gif_indicator_image_view_item_post_gallery)
+        @BindView(R.id.video_or_gif_indicator_image_view_item_post_with_preview)
         ImageView videoOrGifIndicatorImageView;
-        @BindView(R.id.image_wrapper_relative_layout_item_post_gallery)
+        @BindView(R.id.image_wrapper_relative_layout_item_post_with_preview)
         RelativeLayout imageWrapperRelativeLayout;
-        @BindView(R.id.progress_bar_item_post_gallery_type)
+        @BindView(R.id.progress_bar_item_post_with_preview)
         ProgressBar progressBar;
-        @BindView(R.id.image_view_item_post_gallery_type)
+        @BindView(R.id.image_view_item_post_with_preview)
         AspectRatioGifImageView imageView;
-        @BindView(R.id.load_image_error_relative_layout_item_post_gallery_type)
+        @BindView(R.id.load_image_error_relative_layout_item_post_with_preview)
         RelativeLayout errorRelativeLayout;
-        @BindView(R.id.load_image_error_text_view_item_post_gallery_type)
+        @BindView(R.id.load_image_error_text_view_item_post_with_preview)
         TextView errorTextView;
-        @BindView(R.id.image_view_no_preview_gallery_item_post_gallery_type)
+        @BindView(R.id.image_view_no_preview_gallery_item_post_with_preview)
         ImageView noPreviewLinkImageView;
-        @BindView(R.id.bottom_constraint_layout_item_post_gallery_type)
+        @BindView(R.id.bottom_constraint_layout_item_post_with_preview)
         ConstraintLayout bottomConstraintLayout;
-        @BindView(R.id.plus_button_item_post_gallery_type)
+        @BindView(R.id.plus_button_item_post_with_preview)
         ImageView upvoteButton;
-        @BindView(R.id.score_text_view_item_post_gallery_type)
+        @BindView(R.id.score_text_view_item_post_with_preview)
         TextView scoreTextView;
-        @BindView(R.id.minus_button_item_post_gallery_type)
+        @BindView(R.id.minus_button_item_post_with_preview)
         ImageView downvoteButton;
-        @BindView(R.id.comments_count_item_post_gallery_type)
+        @BindView(R.id.comments_count_item_post_with_preview)
         TextView commentsCountTextView;
-        @BindView(R.id.save_button_item_post_gallery_type)
+        @BindView(R.id.save_button_item_post_with_preview)
         ImageView saveButton;
-        @BindView(R.id.share_button_item_post_gallery_type)
+        @BindView(R.id.share_button_item_post_with_preview)
         ImageView shareButton;
 
-        PostGalleryTypeViewHolder(View itemView) {
+        PostWithPreviewTypeViewHolder(View itemView) {
             super(itemView);
             ButterKnife.bind(this, itemView);
             setBaseView(cardView,
diff --git a/app/src/main/res/layout/item_post_gallery.xml b/app/src/main/res/layout/item_post_with_preview.xml
similarity index 88%
rename from app/src/main/res/layout/item_post_gallery.xml
rename to app/src/main/res/layout/item_post_with_preview.xml
index dbe3cc28..b57867df 100644
--- a/app/src/main/res/layout/item_post_gallery.xml
+++ b/app/src/main/res/layout/item_post_with_preview.xml
@@ -6,7 +6,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_marginTop="8dp"
     android:layout_marginBottom="8dp"
-    android:id="@+id/card_view_item_post_gallery_type"
+    android:id="@+id/card_view_item_post_with_preview"
     app:cardBackgroundColor="?attr/cardViewBackgroundColor"
     app:cardElevation="2dp"
     app:cardCornerRadius="16dp">
@@ -22,7 +22,7 @@
             android:padding="16dp">
 
             <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
-                android:id="@+id/icon_gif_image_view_item_post_gallery_type"
+                android:id="@+id/icon_gif_image_view_item_post_with_preview"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_gravity="center"
@@ -31,7 +31,7 @@
                 app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
-                android:id="@+id/subreddit_name_text_view_item_post_gallery_type"
+                android:id="@+id/subreddit_name_text_view_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -39,15 +39,15 @@
                 android:layout_marginEnd="8dp"
                 android:textSize="?attr/font_default"
                 android:fontFamily="?attr/font_family"
-                app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_gallery_type"
-                app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_gallery_type"
-                app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_gallery_type"
+                app:layout_constraintBottom_toTopOf="@id/user_text_view_item_post_with_preview"
+                app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post_with_preview"
+                app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_with_preview"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constrainedWidth="true"
                 app:layout_constraintHorizontal_bias="0"/>
 
             <TextView
-                android:id="@+id/user_text_view_item_post_gallery_type"
+                android:id="@+id/user_text_view_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
@@ -55,14 +55,14 @@
                 android:textSize="?attr/font_default"
                 android:fontFamily="?attr/font_family"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_gallery_type"
-                app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_gallery_type"
-                app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_gallery_type"
+                app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_with_preview"
+                app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post_with_preview"
+                app:layout_constraintTop_toBottomOf="@+id/subreddit_name_text_view_item_post_with_preview"
                 app:layout_constraintHorizontal_bias="0"
                 app:layout_constrainedWidth="true" />
 
             <ImageView
-                android:id="@+id/stickied_post_image_view_item_post_gallery_type"
+                android:id="@+id/stickied_post_image_view_item_post_with_preview"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_marginEnd="8dp"
@@ -73,7 +73,7 @@
                 tools:visibility="visible" />
 
             <TextView
-                android:id="@+id/post_time_text_view_item_post_gallery_type"
+                android:id="@+id/post_time_text_view_item_post_with_preview"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:gravity="end"
@@ -94,7 +94,7 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <TextView
-            android:id="@+id/title_text_view_item_post_gallery_type"
+            android:id="@+id/title_text_view_item_post_with_preview"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingStart="16dp"
@@ -103,7 +103,7 @@
             android:fontFamily="?attr/title_font_family" />
 
         <TextView
-            android:id="@+id/content_text_view_item_post_gallery_type"
+            android:id="@+id/content_text_view_item_post_with_preview"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -124,7 +124,7 @@
             app:flRowSpacing="8dp">
 
             <com.libRG.CustomTextView
-                android:id="@+id/type_text_view_item_post_gallery_type"
+                android:id="@+id/type_text_view_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:padding="4dp"
@@ -136,7 +136,7 @@
                 app:lib_setShape="rectangle" />
 
             <com.libRG.CustomTextView
-                android:id="@+id/spoiler_custom_text_view_item_post_gallery_type"
+                android:id="@+id/spoiler_custom_text_view_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -150,7 +150,7 @@
                 app:lib_setShape="rectangle" />
 
             <com.libRG.CustomTextView
-                android:id="@+id/nsfw_text_view_item_post_gallery_type"
+                android:id="@+id/nsfw_text_view_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:padding="4dp"
@@ -163,7 +163,7 @@
                 app:lib_setShape="rectangle" />
 
             <com.libRG.CustomTextView
-                android:id="@+id/flair_custom_text_view_item_post_gallery_type"
+                android:id="@+id/flair_custom_text_view_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -176,7 +176,7 @@
                 app:lib_setShape="rectangle" />
 
             <com.libRG.CustomTextView
-                android:id="@+id/awards_text_view_item_post_gallery_type"
+                android:id="@+id/awards_text_view_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:padding="4dp"
@@ -188,21 +188,21 @@
                 app:lib_setShape="rectangle" />
 
             <ImageView
-                android:id="@+id/archived_image_view_item_post_gallery_type"
+                android:id="@+id/archived_image_view_item_post_with_preview"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_archive_outline"
                 android:visibility="gone" />
 
             <ImageView
-                android:id="@+id/locked_image_view_item_post_gallery_type"
+                android:id="@+id/locked_image_view_item_post_with_preview"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_outline_lock_24dp"
                 android:visibility="gone" />
 
             <ImageView
-                android:id="@+id/crosspost_image_view_item_post_gallery_type"
+                android:id="@+id/crosspost_image_view_item_post_with_preview"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/crosspost"
@@ -211,7 +211,7 @@
         </com.nex3z.flowlayout.FlowLayout>
 
         <TextView
-            android:id="@+id/link_text_view_item_post_gallery"
+            android:id="@+id/link_text_view_item_post_with_preview"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
@@ -222,20 +222,20 @@
             android:visibility="gone" />
 
         <RelativeLayout
-            android:id="@+id/image_wrapper_relative_layout_item_post_gallery"
+            android:id="@+id/image_wrapper_relative_layout_item_post_with_preview"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="gone">
 
             <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
-                android:id="@+id/image_view_item_post_gallery_type"
+                android:id="@+id/image_view_item_post_with_preview"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:adjustViewBounds="true"
                 android:scaleType="fitStart" />
 
             <ImageView
-                android:id="@+id/video_or_gif_indicator_image_view_item_post_gallery"
+                android:id="@+id/video_or_gif_indicator_image_view_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="16dp"
@@ -245,20 +245,20 @@
                 android:visibility="gone" />
 
             <ProgressBar
-                android:id="@+id/progress_bar_item_post_gallery_type"
+                android:id="@+id/progress_bar_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true" />
 
             <RelativeLayout
-                android:id="@+id/load_image_error_relative_layout_item_post_gallery_type"
+                android:id="@+id/load_image_error_relative_layout_item_post_with_preview"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_centerInParent="true"
                 android:visibility="gone">
 
                 <TextView
-                    android:id="@+id/load_image_error_text_view_item_post_gallery_type"
+                    android:id="@+id/load_image_error_text_view_item_post_with_preview"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:drawableTop="@drawable/ic_error_outline_black_24dp"
@@ -273,7 +273,7 @@
         </RelativeLayout>
 
         <ImageView
-            android:id="@+id/image_view_no_preview_gallery_item_post_gallery_type"
+            android:id="@+id/image_view_no_preview_gallery_item_post_with_preview"
             android:layout_width="match_parent"
             android:layout_height="150dp"
             android:scaleType="center"
@@ -282,12 +282,12 @@
             android:visibility="gone" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/bottom_constraint_layout_item_post_gallery_type"
+            android:id="@+id/bottom_constraint_layout_item_post_with_preview"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
             <ImageView
-                android:id="@+id/plus_button_item_post_gallery_type"
+                android:id="@+id/plus_button_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:padding="12dp"
@@ -300,7 +300,7 @@
                 app:layout_constraintStart_toStartOf="parent" />
 
             <TextView
-                android:id="@+id/score_text_view_item_post_gallery_type"
+                android:id="@+id/score_text_view_item_post_with_preview"
                 android:layout_width="64dp"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -309,10 +309,10 @@
                 android:fontFamily="?attr/font_family"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/plus_button_item_post_gallery_type" />
+                app:layout_constraintStart_toEndOf="@id/plus_button_item_post_with_preview" />
 
             <ImageView
-                android:id="@+id/minus_button_item_post_gallery_type"
+                android:id="@+id/minus_button_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:padding="12dp"
@@ -322,10 +322,10 @@
                 android:focusable="true"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_gallery_type" />
+                app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_with_preview" />
 
             <TextView
-                android:id="@+id/comments_count_item_post_gallery_type"
+                android:id="@+id/comments_count_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:padding="12dp"
@@ -337,10 +337,10 @@
                 android:drawablePadding="12dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/minus_button_item_post_gallery_type" />
+                app:layout_constraintStart_toEndOf="@id/minus_button_item_post_with_preview" />
 
             <ImageView
-                android:id="@+id/save_button_item_post_gallery_type"
+                android:id="@+id/save_button_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:padding="12dp"
@@ -350,11 +350,11 @@
                 app:layout_constraintHorizontal_bias="1"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/comments_count_item_post_gallery_type"
-                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_gallery_type" />
+                app:layout_constraintStart_toEndOf="@id/comments_count_item_post_with_preview"
+                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_with_preview" />
 
             <ImageView
-                android:id="@+id/share_button_item_post_gallery_type"
+                android:id="@+id/share_button_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:padding="12dp"