diff --git a/Signal/Images.xcassets/message_status_failed.imageset/Contents.json b/Signal/Images.xcassets/message_status_failed.imageset/Contents.json
new file mode 100644
index 000000000..386ea46b7
--- /dev/null
+++ b/Signal/Images.xcassets/message_status_failed.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "error-12@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "error-12@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "error-12@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Signal/Images.xcassets/message_status_failed.imageset/error-12@1x.png b/Signal/Images.xcassets/message_status_failed.imageset/error-12@1x.png
new file mode 100644
index 000000000..e6f7131a4
Binary files /dev/null and b/Signal/Images.xcassets/message_status_failed.imageset/error-12@1x.png differ
diff --git a/Signal/Images.xcassets/message_status_failed.imageset/error-12@2x.png b/Signal/Images.xcassets/message_status_failed.imageset/error-12@2x.png
new file mode 100644
index 000000000..f8c0b4b7c
Binary files /dev/null and b/Signal/Images.xcassets/message_status_failed.imageset/error-12@2x.png differ
diff --git a/Signal/Images.xcassets/message_status_failed.imageset/error-12@3x.png b/Signal/Images.xcassets/message_status_failed.imageset/error-12@3x.png
new file mode 100644
index 000000000..bad89d6c0
Binary files /dev/null and b/Signal/Images.xcassets/message_status_failed.imageset/error-12@3x.png differ
diff --git a/Signal/Images.xcassets/message_send_failed.imageset/Contents.json b/Signal/Images.xcassets/message_status_failed_large.imageset/Contents.json
similarity index 100%
rename from Signal/Images.xcassets/message_send_failed.imageset/Contents.json
rename to Signal/Images.xcassets/message_status_failed_large.imageset/Contents.json
diff --git a/Signal/Images.xcassets/message_send_failed.imageset/error-20@1x.png b/Signal/Images.xcassets/message_status_failed_large.imageset/error-20@1x.png
similarity index 100%
rename from Signal/Images.xcassets/message_send_failed.imageset/error-20@1x.png
rename to Signal/Images.xcassets/message_status_failed_large.imageset/error-20@1x.png
diff --git a/Signal/Images.xcassets/message_send_failed.imageset/error-20@2x.png b/Signal/Images.xcassets/message_status_failed_large.imageset/error-20@2x.png
similarity index 100%
rename from Signal/Images.xcassets/message_send_failed.imageset/error-20@2x.png
rename to Signal/Images.xcassets/message_status_failed_large.imageset/error-20@2x.png
diff --git a/Signal/Images.xcassets/message_send_failed.imageset/error-20@3x.png b/Signal/Images.xcassets/message_status_failed_large.imageset/error-20@3x.png
similarity index 100%
rename from Signal/Images.xcassets/message_send_failed.imageset/error-20@3x.png
rename to Signal/Images.xcassets/message_status_failed_large.imageset/error-20@3x.png
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
index f15b44d5c..6aa0fe4f7 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
@@ -220,7 +220,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (UIImage *)sendFailureBadge
 {
-    UIImage *image = [UIImage imageNamed:@"message_send_failed"];
+    UIImage *image = [UIImage imageNamed:@"message_status_failed_large"];
     OWSAssert(image);
     OWSAssert(image.size.width == self.sendFailureBadgeSize && image.size.height == self.sendFailureBadgeSize);
     return image;
diff --git a/Signal/src/ViewControllers/HomeView/HomeViewCell.m b/Signal/src/ViewControllers/HomeView/HomeViewCell.m
index ffa39e5b1..cef88eb90 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewCell.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewCell.m
@@ -286,17 +286,18 @@ NS_ASSUME_NONNULL_BEGIN
                     statusIndicatorImage = [UIImage imageNamed:@"message_status_sent"];
                     break;
                 case MessageReceiptStatusDelivered:
+                    statusIndicatorImage = [UIImage imageNamed:@"message_status_delivered"];
+                    break;
                 case MessageReceiptStatusRead:
                     statusIndicatorImage = [UIImage imageNamed:@"message_status_delivered"];
+                    messageStatusViewTintColor = [UIColor ows_signalBlueColor];
                     break;
                 case MessageReceiptStatusFailed:
                     // TODO:
-                    statusIndicatorImage = [UIImage imageNamed:@"message_status_sending"];
+                    statusIndicatorImage = [UIImage imageNamed:@"message_status_failed"];
+                    messageStatusViewTintColor = [UIColor ows_destructiveRedColor];
                     break;
             }
-            if (messageStatus == MessageReceiptStatusRead) {
-                messageStatusViewTintColor = [UIColor ows_signalBlueColor];
-            }
         }
         self.messageStatusView.image = [statusIndicatorImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
         self.messageStatusView.tintColor = messageStatusViewTintColor;