diff --git a/Tusker/Screens/Conversation/ConversationTableViewController.swift b/Tusker/Screens/Conversation/ConversationTableViewController.swift
index 1712423a99..94a0452d91 100644
--- a/Tusker/Screens/Conversation/ConversationTableViewController.swift
+++ b/Tusker/Screens/Conversation/ConversationTableViewController.swift
@@ -127,6 +127,7 @@ class ConversationTableViewController: EnhancedTableViewController {
         } else {
             guard let cell = tableView.dequeueReusableCell(withIdentifier: "statusCell", for: indexPath) as? TimelineStatusTableViewCell else { fatalError() }
             cell.showStatusAutomatically = showStatusesAutomatically
+            cell.showReplyIndicator = false
             cell.delegate = self
             cell.updateUI(statusID: id, state: state)
             return cell
diff --git a/Tusker/Screens/Timeline/TimelineTableViewController.swift b/Tusker/Screens/Timeline/TimelineTableViewController.swift
index b88ceafb93..025c98263e 100644
--- a/Tusker/Screens/Timeline/TimelineTableViewController.swift
+++ b/Tusker/Screens/Timeline/TimelineTableViewController.swift
@@ -108,6 +108,7 @@ class TimelineTableViewController: EnhancedTableViewController {
 
         let (id, state) = timelineSegments[indexPath.section][indexPath.row]
         cell.delegate = self
+
         cell.updateUI(statusID: id, state: state)
 
         return cell
diff --git a/Tusker/Views/Status/ConversationMainStatusTableViewCell.xib b/Tusker/Views/Status/ConversationMainStatusTableViewCell.xib
index 7e49188cac..856b6253aa 100644
--- a/Tusker/Views/Status/ConversationMainStatusTableViewCell.xib
+++ b/Tusker/Views/Status/ConversationMainStatusTableViewCell.xib
@@ -38,13 +38,14 @@
                                     <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="3Qu-IO-5wt">
-                                    <rect key="frame" x="321" y="0.0" width="22" height="22"/>
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="globe" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="3Qu-IO-5wt">
+                                    <rect key="frame" x="321" y="1" width="22" height="20"/>
                                     <color key="tintColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="22" id="Kqh-qI-dSa"/>
                                         <constraint firstAttribute="width" constant="22" id="QY1-tL-QHr"/>
                                     </constraints>
+                                    <preferredSymbolConfiguration key="preferredSymbolConfiguration" weight="thin"/>
                                 </imageView>
                             </subviews>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -238,6 +239,7 @@
         <image name="arrowshape.turn.up.left.fill" catalog="system" width="128" height="106"/>
         <image name="chevron.down" catalog="system" width="128" height="72"/>
         <image name="ellipsis" catalog="system" width="128" height="37"/>
+        <image name="globe" catalog="system" width="128" height="121"/>
         <image name="repeat" catalog="system" width="128" height="99"/>
         <image name="star.fill" catalog="system" width="128" height="116"/>
     </resources>
diff --git a/Tusker/Views/Status/TimelineStatusTableViewCell.swift b/Tusker/Views/Status/TimelineStatusTableViewCell.swift
index 0b79b5ce33..b494c6e62c 100644
--- a/Tusker/Views/Status/TimelineStatusTableViewCell.swift
+++ b/Tusker/Views/Status/TimelineStatusTableViewCell.swift
@@ -22,11 +22,13 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
     @IBOutlet weak var reblogLabel: EmojiLabel!
     @IBOutlet weak var timestampLabel: UILabel!
     @IBOutlet weak var pinImageView: UIImageView!
+    @IBOutlet weak var replyImageView: UIImageView!
     
     var reblogStatusID: String?
     var rebloggerID: String?
     
-    var showPinned: Bool = false
+    var showPinned = false
+    var showReplyIndicator = true
     
     var updateTimestampWorkItem: DispatchWorkItem?
 
@@ -82,9 +84,13 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
 
         updateTimestamp()
         
-        let pinned = status.pinned ?? false
-        pinImageView.isHidden = !(pinned && showPinned)
-        timestampLabel.isHidden = !pinImageView.isHidden
+        if showPinned {
+            let pinned = status.pinned ?? false
+            timestampLabel.isHidden = pinned
+            pinImageView.isHidden = !pinned
+        }
+
+        replyImageView.isHidden = !showReplyIndicator || status.inReplyToID == nil
     }
     
     @objc override func preferencesChanged() {
diff --git a/Tusker/Views/Status/TimelineStatusTableViewCell.xib b/Tusker/Views/Status/TimelineStatusTableViewCell.xib
index 95af24c270..0c37b42da1 100644
--- a/Tusker/Views/Status/TimelineStatusTableViewCell.xib
+++ b/Tusker/Views/Status/TimelineStatusTableViewCell.xib
@@ -152,11 +152,21 @@
                                     </subviews>
                                 </stackView>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="globe" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="LRh-Cc-1br">
-                                    <rect key="frame" x="30.5" y="55" width="19.5" height="20.5"/>
+                                    <rect key="frame" x="31" y="55" width="19" height="20"/>
                                     <color key="tintColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="22" id="3Mk-NN-6fY"/>
                                     </constraints>
+                                    <preferredSymbolConfiguration key="preferredSymbolConfiguration" weight="thin"/>
+                                </imageView>
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bubble.left.and.bubble.right" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="KdQ-Zn-IhD">
+                                    <rect key="frame" x="0.0" y="55" width="25.5" height="21.5"/>
+                                    <color key="tintColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <accessibility key="accessibilityConfiguration" label="Is a reply"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="22" id="x0C-Qo-YVA"/>
+                                    </constraints>
+                                    <preferredSymbolConfiguration key="preferredSymbolConfiguration" weight="thin"/>
                                 </imageView>
                             </subviews>
                             <constraints>
@@ -164,9 +174,12 @@
                                 <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="QMP-j2-HLn" secondAttribute="bottom" constant="8" id="2Ao-Gj-fY3"/>
                                 <constraint firstItem="QMP-j2-HLn" firstAttribute="top" secondItem="ve3-Y1-NQH" secondAttribute="top" id="PC4-Bi-QXm"/>
                                 <constraint firstItem="LRh-Cc-1br" firstAttribute="top" secondItem="QMP-j2-HLn" secondAttribute="bottom" constant="4" id="QE5-0f-q1a"/>
+                                <constraint firstItem="KdQ-Zn-IhD" firstAttribute="top" secondItem="QMP-j2-HLn" secondAttribute="bottom" constant="4" id="R2V-fr-WCN"/>
                                 <constraint firstItem="gIY-Wp-RSk" firstAttribute="top" secondItem="QMP-j2-HLn" secondAttribute="top" id="fEd-wN-kuQ"/>
                                 <constraint firstAttribute="trailingMargin" secondItem="gIY-Wp-RSk" secondAttribute="trailing" id="hKk-kO-wFT"/>
                                 <constraint firstAttribute="bottom" secondItem="gIY-Wp-RSk" secondAttribute="bottom" id="kRU-Ct-CIg"/>
+                                <constraint firstItem="KdQ-Zn-IhD" firstAttribute="bottom" relation="lessThanOrEqual" secondItem="ve3-Y1-NQH" secondAttribute="bottom" id="rp8-N9-Iid"/>
+                                <constraint firstItem="KdQ-Zn-IhD" firstAttribute="leading" secondItem="QMP-j2-HLn" secondAttribute="leading" id="uJd-Cz-AG3"/>
                                 <constraint firstItem="gIY-Wp-RSk" firstAttribute="leading" secondItem="LRh-Cc-1br" secondAttribute="trailing" constant="8" id="zFc-5l-916"/>
                                 <constraint firstItem="QMP-j2-HLn" firstAttribute="leading" secondItem="ve3-Y1-NQH" secondAttribute="leading" id="zeW-tQ-uJl"/>
                             </constraints>
@@ -207,6 +220,7 @@
                 <outlet property="reblogButton" destination="6tW-z8-Qh9" id="u2t-8D-kOn"/>
                 <outlet property="reblogLabel" destination="lDH-50-AJZ" id="uJf-Pt-cEP"/>
                 <outlet property="replyButton" destination="rKF-yF-KIa" id="rka-q1-o4a"/>
+                <outlet property="replyImageView" destination="KdQ-Zn-IhD" id="jqs-FK-K1N"/>
                 <outlet property="timestampLabel" destination="35d-EA-ReR" id="Ny2-nV-nqP"/>
                 <outlet property="usernameLabel" destination="j89-zc-SFa" id="bXX-FZ-fCp"/>
                 <outlet property="visibilityImageView" destination="LRh-Cc-1br" id="pxm-JK-jAz"/>
@@ -216,6 +230,7 @@
     </objects>
     <resources>
         <image name="arrowshape.turn.up.left.fill" catalog="system" width="128" height="106"/>
+        <image name="bubble.left.and.bubble.right" catalog="system" width="128" height="96"/>
         <image name="chevron.down" catalog="system" width="128" height="72"/>
         <image name="ellipsis" catalog="system" width="128" height="37"/>
         <image name="globe" catalog="system" width="128" height="121"/>