diff --git a/Signal/Images.xcassets/ic_hourglass_empty.imageset/Contents.json b/Signal/Images.xcassets/ic_hourglass_empty.imageset/Contents.json
deleted file mode 100644
index c660cb9a9..000000000
--- a/Signal/Images.xcassets/ic_hourglass_empty.imageset/Contents.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "ic_hourglass_empty.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "ic_hourglass_empty@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "ic_hourglass_empty@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}
\ No newline at end of file
diff --git a/Signal/Images.xcassets/ic_hourglass_empty.imageset/ic_hourglass_empty.png b/Signal/Images.xcassets/ic_hourglass_empty.imageset/ic_hourglass_empty.png
deleted file mode 100644
index ea3f04855..000000000
Binary files a/Signal/Images.xcassets/ic_hourglass_empty.imageset/ic_hourglass_empty.png and /dev/null differ
diff --git a/Signal/Images.xcassets/ic_hourglass_empty.imageset/ic_hourglass_empty@2x.png b/Signal/Images.xcassets/ic_hourglass_empty.imageset/ic_hourglass_empty@2x.png
deleted file mode 100644
index 49bc8a4a6..000000000
Binary files a/Signal/Images.xcassets/ic_hourglass_empty.imageset/ic_hourglass_empty@2x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/ic_hourglass_empty.imageset/ic_hourglass_empty@3x.png b/Signal/Images.xcassets/ic_hourglass_empty.imageset/ic_hourglass_empty@3x.png
deleted file mode 100644
index 8a693939d..000000000
Binary files a/Signal/Images.xcassets/ic_hourglass_empty.imageset/ic_hourglass_empty@3x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/ic_hourglass_full.imageset/Contents.json b/Signal/Images.xcassets/ic_hourglass_full.imageset/Contents.json
deleted file mode 100644
index 9f72c5b3f..000000000
--- a/Signal/Images.xcassets/ic_hourglass_full.imageset/Contents.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "ic_hourglass_full.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "ic_hourglass_full@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "ic_hourglass_full@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}
\ No newline at end of file
diff --git a/Signal/Images.xcassets/ic_hourglass_full.imageset/ic_hourglass_full.png b/Signal/Images.xcassets/ic_hourglass_full.imageset/ic_hourglass_full.png
deleted file mode 100644
index f5158ed76..000000000
Binary files a/Signal/Images.xcassets/ic_hourglass_full.imageset/ic_hourglass_full.png and /dev/null differ
diff --git a/Signal/Images.xcassets/ic_hourglass_full.imageset/ic_hourglass_full@2x.png b/Signal/Images.xcassets/ic_hourglass_full.imageset/ic_hourglass_full@2x.png
deleted file mode 100644
index 933dd350a..000000000
Binary files a/Signal/Images.xcassets/ic_hourglass_full.imageset/ic_hourglass_full@2x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/ic_hourglass_full.imageset/ic_hourglass_full@3x.png b/Signal/Images.xcassets/ic_hourglass_full.imageset/ic_hourglass_full@3x.png
deleted file mode 100644
index b0c4631c0..000000000
Binary files a/Signal/Images.xcassets/ic_hourglass_full.imageset/ic_hourglass_full@3x.png and /dev/null differ
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
index 9eba65a80..a72b3bce6 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
@@ -395,9 +395,11 @@ NS_ASSUME_NONNULL_BEGIN
     OWSMessageFooterView *footerView = self.footerView;
     [footerView configureWithConversationViewItem:self.viewItem];
     if (textStackView) {
+        // Display footer below text.
         [textStackView addArrangedSubview:self.footerView];
         [self.footerView setHasShadows:NO viewItem:self.viewItem];
     } else if (bodyMediaView) {
+        // Display footer over media.
         [bodyMediaView addSubview:footerView];
 
         bodyMediaView.layoutMargins = UIEdgeInsetsZero;
@@ -408,7 +410,6 @@ NS_ASSUME_NONNULL_BEGIN
         ]];
         [self.footerView setHasShadows:YES viewItem:self.viewItem];
     } else {
-        // Display footer over media.
         OWSFail(@"%@ could not display footer.", self.logTag);
     }
 
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m
index 33680ccc1..dec5be284 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m
@@ -43,18 +43,22 @@ NS_ASSUME_NONNULL_BEGIN
     self.timestampLabel = [UILabel new];
     // TODO: Color
     self.timestampLabel.textColor = [UIColor lightGrayColor];
+    [self addArrangedSubview:self.timestampLabel];
 
     self.spacerView = [UIView new];
     [self.spacerView setContentHuggingLow];
+    [self addArrangedSubview:self.spacerView];
 
     self.statusLabel = [UILabel new];
     // TODO: Color
     self.statusLabel.textColor = [UIColor lightGrayColor];
+    [self addArrangedSubview:self.statusLabel];
 
     self.statusIndicatorView = [UIView new];
     [self.statusIndicatorView autoSetDimension:ALDimensionWidth toSize:self.statusIndicatorSize];
     [self.statusIndicatorView autoSetDimension:ALDimensionHeight toSize:self.statusIndicatorSize];
     self.statusIndicatorView.layer.cornerRadius = self.statusIndicatorSize * 0.5f;
+    [self addArrangedSubview:self.statusIndicatorView];
 }
 
 - (void)configureFonts
@@ -86,20 +90,13 @@ NS_ASSUME_NONNULL_BEGIN
     // TODO:
     self.statusIndicatorView.backgroundColor = [UIColor orangeColor];
 
+    BOOL isOutgoing = (viewItem.interaction.interactionType == OWSInteractionType_OutgoingMessage);
     for (UIView *subview in @[
-             self.timestampLabel,
+             self.spacerView,
              self.statusLabel,
              self.statusIndicatorView,
          ]) {
-        [subview removeFromSuperview];
-    }
-    if (viewItem.interaction.interactionType == OWSInteractionType_OutgoingMessage) {
-        [self addArrangedSubview:self.timestampLabel];
-        [self addArrangedSubview:self.spacerView];
-        [self addArrangedSubview:self.statusLabel];
-        [self addArrangedSubview:self.statusIndicatorView];
-    } else {
-        [self addArrangedSubview:self.timestampLabel];
+        subview.hidden = !isOutgoing;
     }
 }