diff --git a/Podfile.lock b/Podfile.lock
index 5cdbd1773..ae7393045 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -135,7 +135,7 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   SignalServiceKit:
-    :commit: c274e3aa30ed07c5166f1bd3bec7097bafab8dc4
+    :commit: c2cb7c8484326333b5ac9225de993f62fab68c11
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 41b57bb2fc292a814f758441a05243eb38457027
diff --git a/Signal/src/Models/OWSInfoMessage.h b/Signal/src/Models/OWSInfoMessage.h
index f6b704cdf..4ea06a942 100644
--- a/Signal/src/Models/OWSInfoMessage.h
+++ b/Signal/src/Models/OWSInfoMessage.h
@@ -3,20 +3,17 @@
 //  Portions Copyright (c) 2016 Open Whisper Systems. All rights reserved.
 
 #import "OWSDisplayedMessage.h"
+#import "TSInfoMessage.h"
 #import "TSMessageAdapter.h"
 
-typedef NS_ENUM(NSInteger, OWSInfoMessageType) {
-    OWSInfoMessageTypeSessionDidEnd,
-};
-
 @interface OWSInfoMessage : OWSDisplayedMessage
 
-@property (nonatomic) OWSInfoMessageType infoMessageType;
+@property (nonatomic) TSInfoMessageType infoMessageType;
 @property (nonatomic) TSMessageAdapterType messageType;
 
 #pragma mark - Initialization
 
-- (instancetype)initWithInfoType:(OWSInfoMessageType)messageType
+- (instancetype)initWithInfoType:(TSInfoMessageType)messageType
                         senderId:(NSString *)senderId
                senderDisplayName:(NSString *)senderDisplayName
                             date:(NSDate *)date;
diff --git a/Signal/src/Models/OWSInfoMessage.m b/Signal/src/Models/OWSInfoMessage.m
index de34ab554..94c89369b 100644
--- a/Signal/src/Models/OWSInfoMessage.m
+++ b/Signal/src/Models/OWSInfoMessage.m
@@ -6,7 +6,7 @@
 
 @implementation OWSInfoMessage
 
-- (instancetype)initWithInfoType:(OWSInfoMessageType)messageType
+- (instancetype)initWithInfoType:(TSInfoMessageType)messageType
                         senderId:(NSString *)senderId
                senderDisplayName:(NSString *)senderDisplayName
                             date:(NSDate *)date
@@ -27,7 +27,7 @@
 - (NSString *)text
 {
     switch (self.infoMessageType) {
-        case OWSInfoMessageTypeSessionDidEnd:
+        case TSInfoMessageTypeSessionDidEnd:
             return [NSString stringWithFormat:@"Session with %@ ended.", self.senderDisplayName];
             break;
 
diff --git a/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m
index 437e4024e..bbce77d1b 100644
--- a/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m
+++ b/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m
@@ -33,7 +33,7 @@
 
 // for InfoMessages
 
-@property NSInteger infoMessageType;
+@property TSInfoMessageType infoMessageType;
 
 // for ErrorMessages
 
diff --git a/Signal/src/view controllers/MessagesViewController.m b/Signal/src/view controllers/MessagesViewController.m
index afd9b981e..a6b283c2a 100644
--- a/Signal/src/view controllers/MessagesViewController.m	
+++ b/Signal/src/view controllers/MessagesViewController.m	
@@ -876,7 +876,15 @@ typedef enum : NSUInteger {
     infoCell.textView.selectable = NO;
 
     infoCell.messageBubbleContainerView.layer.borderColor = [[UIColor ows_infoMessageBorderColor] CGColor];
-    infoCell.headerImageView.image = [UIImage imageNamed:@"warning_white"];
+    if (infoMessage.infoMessageType == TSInfoMessageTypeDisappearingMessagesUpdate) {
+        infoCell.headerImageView.image = [UIImage imageNamed:@"ic_timer"];
+        infoCell.headerImageView.backgroundColor = [UIColor whiteColor];
+        // Lighten up the broad stroke header icon to match the perceived color of the border.
+        infoCell.headerImageView.tintColor = [UIColor ows_infoMessageBorderColor];
+    } else {
+        infoCell.headerImageView.image = [UIImage imageNamed:@"warning_white"];
+    }
+
 
     return infoCell;
 }