diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
index c7068fe54..84da4e170 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
@@ -97,7 +97,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
     private final SparkButton favouriteButton;
     private final SparkButton bookmarkButton;
     private final ImageButton moreButton;
-    private final ConstraintLayout mediaContainer;
+    protected final ConstraintLayout mediaContainer;
     protected final MediaPreviewLayout mediaPreview;
     private final TextView sensitiveMediaWarning;
     private final View sensitiveMediaShow;
@@ -808,7 +808,11 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
             setBookmarked(actionable.getBookmarked());
             List<Attachment> attachments = status.getAttachments();
             boolean sensitive = actionable.getSensitive();
-            if (statusDisplayOptions.mediaPreviewEnabled() && hasPreviewableAttachment(attachments)) {
+            if (attachments.isEmpty()) {
+                mediaContainer.setVisibility(View.GONE);
+            } else if (statusDisplayOptions.mediaPreviewEnabled() && hasPreviewableAttachment(attachments)) {
+                mediaContainer.setVisibility(View.VISIBLE);
+
                 setMediaPreviews(attachments, sensitive, listener, status.isShowingContent(), statusDisplayOptions.useBlurhash());
 
                 if (attachments.isEmpty()) {
@@ -819,6 +823,8 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
                     mediaLabel.setVisibility(View.GONE);
                 }
             } else {
+                mediaContainer.setVisibility(View.VISIBLE);
+
                 setMediaLabel(attachments, sensitive, listener, status.isShowingContent());
                 // Hide all unused views.
                 mediaPreview.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationViewHolder.java
index 249509b9c..d94f60113 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationViewHolder.java
@@ -24,7 +24,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.keylesspalace.tusky.R;
@@ -91,7 +90,11 @@ public class ConversationViewHolder extends StatusBaseViewHolder {
             setBookmarked(status.getBookmarked());
             List<Attachment> attachments = status.getAttachments();
             boolean sensitive = status.getSensitive();
-            if (statusDisplayOptions.mediaPreviewEnabled() && hasPreviewableAttachment(attachments)) {
+            if (attachments.isEmpty()) {
+                mediaContainer.setVisibility(View.GONE);
+            } else if (statusDisplayOptions.mediaPreviewEnabled() && hasPreviewableAttachment(attachments)) {
+                mediaContainer.setVisibility(View.VISIBLE);
+
                 setMediaPreviews(attachments, sensitive, listener, statusViewData.isShowingContent(),
                         statusDisplayOptions.useBlurhash());
 
@@ -103,6 +106,8 @@ public class ConversationViewHolder extends StatusBaseViewHolder {
                     mediaLabel.setVisibility(View.GONE);
                 }
             } else {
+                mediaContainer.setVisibility(View.VISIBLE);
+
                 setMediaLabel(attachments, sensitive, listener, statusViewData.isShowingContent());
                 // Hide all unused views.
                 mediaPreview.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt b/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt
index 3157919e1..b41b0e88c 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt
@@ -86,7 +86,7 @@ fun setClickableText(
         trailingHashtagView == null || tags.isNullOrEmpty() -> Pair(spannableContent.length, emptyList())
         else -> getTrailingHashtags(spannableContent)
     }
-    val inlineHashtags = mutableListOf<CharSequence>()
+    val inlineHashtags = mutableSetOf<CharSequence>()
 
     view.text = spannableContent.apply {
         styleQuoteSpans(view)
diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index ba1072a1f..6588c679b 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -247,12 +247,11 @@
     <ImageButton
         android:id="@+id/status_reply"
         style="@style/TuskyImageButton"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="4dp"
+        android:layout_width="52dp"
+        android:layout_height="48dp"
+        android:layout_marginStart="-14dp"
+        android:layout_marginTop="2dp"
         android:contentDescription="@string/action_reply"
-        android:padding="4dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/status_favourite"
         app:layout_constraintHorizontal_chainStyle="spread_inside"
@@ -262,11 +261,10 @@
 
     <at.connyduck.sparkbutton.SparkButton
         android:id="@+id/status_favourite"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
+        android:layout_width="52dp"
+        android:layout_height="48dp"
         android:clipToPadding="false"
         android:contentDescription="@string/action_favourite"
-        android:padding="4dp"
         app:layout_constraintEnd_toStartOf="@id/status_bookmark"
         app:layout_constraintStart_toEndOf="@id/status_reply"
         app:layout_constraintTop_toTopOf="@id/status_reply"
@@ -278,12 +276,11 @@
 
     <at.connyduck.sparkbutton.SparkButton
         android:id="@+id/status_bookmark"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
+        android:layout_width="52dp"
+        android:layout_height="48dp"
         android:clipToPadding="false"
         android:contentDescription="@string/action_bookmark"
         android:importantForAccessibility="no"
-        android:padding="4dp"
         app:layout_constraintEnd_toStartOf="@id/status_more"
         app:layout_constraintStart_toEndOf="@id/status_favourite"
         app:layout_constraintTop_toTopOf="@id/status_reply"
@@ -296,11 +293,10 @@
     <ImageButton
         android:id="@+id/status_more"
         style="@style/TuskyImageButton"
-        android:layout_width="24dp"
-        android:layout_height="30dp"
+        android:layout_width="52dp"
+        android:layout_height="48dp"
         android:layout_marginEnd="8dp"
         android:contentDescription="@string/action_more"
-        android:padding="4dp"
         app:layout_constraintBottom_toBottomOf="@id/status_reply"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/status_bookmark"
diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml
index dec22a70e..5cdded3bb 100644
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@@ -25,9 +25,9 @@
         android:textSize="?attr/status_text_medium"
         app:drawableStartCompat="@drawable/ic_reblog_18dp"
         app:drawableTint="?android:textColorTertiary"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintHorizontal_bias="0"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:ignore="RtlSymmetry"
         tools:text="ConnyDuck boosted"
@@ -126,9 +126,9 @@
         style="@style/TuskyButton.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingHorizontal="0dp"
         android:layout_marginEnd="10dp"
         android:minHeight="0dp"
+        android:paddingHorizontal="0dp"
         android:text="@string/action_show_original"
         android:visibility="gone"
         app:layout_constraintStart_toStartOf="@id/status_display_name"
@@ -192,14 +192,15 @@
         app:layout_constraintTop_toBottomOf="@id/status_content_warning_button"
         tools:text="This is a status" />
 
-    <include layout="@layout/item_preview_card"
+    <include
+        layout="@layout/item_preview_card"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="14dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/status_display_name"
-        app:layout_constraintTop_toBottomOf="@+id/button_toggle_content"/>
+        app:layout_constraintTop_toBottomOf="@+id/button_toggle_content" />
 
     <Button
         android:id="@+id/button_toggle_content"
@@ -287,16 +288,16 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="14dp"
+        android:ellipsize="end"
         android:hyphenationFrequency="full"
         android:importantForAccessibility="no"
+        android:singleLine="true"
         android:textColor="?android:textColorPrimary"
         android:textIsSelectable="true"
         android:textSize="?attr/status_text_medium"
-        android:singleLine="true"
-        android:ellipsize="end"
-        app:layout_constraintTop_toBottomOf="@id/status_poll_description"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/status_display_name"
+        app:layout_constraintTop_toBottomOf="@id/status_poll_description"
         tools:text="#one #two #three #four #five #six #seven #eight #nine #ten" />
 
     <ImageButton
@@ -305,6 +306,7 @@
         android:layout_width="52dp"
         android:layout_height="48dp"
         android:layout_marginStart="-14dp"
+        android:layout_marginTop="2dp"
         android:contentDescription="@string/action_reply"
         android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"