diff --git a/Signal/src/UIColor+OWS.m b/Signal/src/UIColor+OWS.m
index bdeef6270..757763ae6 100644
--- a/Signal/src/UIColor+OWS.m
+++ b/Signal/src/UIColor+OWS.m
@@ -42,8 +42,8 @@
 }
 
 + (UIColor *) ows_greenColor {
-    // green: #92FF8A
-    return [UIColor colorWithRed:146.f/255.f green:255.f/255.f blue:138.f/255.f alpha:1.f];
+    // green: #BF4240
+    return [UIColor colorWithRed:66.f/255.f green:191.f/255.f blue:64.f/255.f alpha:1.f];
 }
 
 + (UIColor *) ows_redColor {
diff --git a/Signal/src/textsecure/Messages/TSMessagesManager+sendMessages.m b/Signal/src/textsecure/Messages/TSMessagesManager+sendMessages.m
index 69ef3fffe..46bcc8dc6 100644
--- a/Signal/src/textsecure/Messages/TSMessagesManager+sendMessages.m
+++ b/Signal/src/textsecure/Messages/TSMessagesManager+sendMessages.m
@@ -271,7 +271,7 @@ dispatch_queue_t sendingQueue() {
     }
 }
 
-- (void) saveGroupMessage:(TSOutgoingMessage*)message inThread:(TSThread*)thread{
+- (void)saveGroupMessage:(TSOutgoingMessage*)message inThread:(TSThread*)thread{
     if(message.groupMetaMessage==TSGroupMessageDeliver) {
         [self saveMessage:message withState:message.messageState];
     }
diff --git a/Signal/src/view controllers/InboxTableViewCell.m b/Signal/src/view controllers/InboxTableViewCell.m
index e5e0c2a8c..abb8c9f70 100644
--- a/Signal/src/view controllers/InboxTableViewCell.m	
+++ b/Signal/src/view controllers/InboxTableViewCell.m	
@@ -76,6 +76,10 @@
     }
 
     self.separatorInset = UIEdgeInsetsMake(0,_contactPictureView.frame.size.width*1.5f, 0, 0);
+    
+    if (thread.hasUnreadMessages) {
+        [self updateCellForUnreadMessage];
+    }
 }
 
 -(void)configureForState:(CellState)state
diff --git a/Signal/src/view controllers/SettingsTableViewController.m b/Signal/src/view controllers/SettingsTableViewController.m
index 43d9eedae..3d9ecac22 100644
--- a/Signal/src/view controllers/SettingsTableViewController.m	
+++ b/Signal/src/view controllers/SettingsTableViewController.m	
@@ -74,7 +74,7 @@ typedef enum {
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self.navigationController.navigationBar setTranslucent:NO];
-
+    
     self.tableView.tableFooterView = [[UIView alloc]initWithFrame:CGRectZero];
     self.registeredNumber.text     = [PhoneNumber bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:[TSAccountManager registeredNumber]];
     [self findAndSetRegisteredName];
@@ -164,7 +164,7 @@ typedef enum {
             
         case kUnregisterSection:
         {
-            [self unregisterUser:self];
+            [self unregisterUser:nil];
             break;
         }
             
@@ -175,6 +175,19 @@ typedef enum {
 
 
 -(IBAction)unregisterUser:(id)sender {
+
+    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"Are you sure you want to destroy your account?"
+                                                                             message:@"This will reset the application by deleting your messages and unregister you with the server. The app will close after deletion of data."
+                                                                      preferredStyle:UIAlertControllerStyleAlert];
+    [alertController addAction:[UIAlertAction actionWithTitle:@"Proceed" style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
+        [self unregisterUser:self];
+    }]];
+    [alertController addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
+    
+    [self presentViewController:alertController animated:YES completion:nil];
+}
+
+- (void)proceedToUnregistration{
     [TSAccountManager unregisterTextSecureWithSuccess:^{
         [PushManager.sharedManager registrationForPushWithSuccess:^(NSData* pushToken){
             [[RPServerRequestsManager sharedInstance]performRequest:[RPAPICall unregisterWithPushToken:pushToken] success:^(NSURLSessionDataTask *task, id responseObject) {
@@ -187,7 +200,7 @@ typedef enum {
             SignalAlertView(@"Failed to unregister RedPhone component of Signal", @"");
         }];
     } failure:^(NSError *error) {
-       SignalAlertView(@"Failed to unregister TextSecure component of Signal", @"");
+        SignalAlertView(@"Failed to unregister TextSecure component of Signal", @"");
     }];
 }
 
diff --git a/Signal/src/view controllers/UITests/SignalsViewController.m b/Signal/src/view controllers/UITests/SignalsViewController.m
index 9dab669d9..6973e6d62 100644
--- a/Signal/src/view controllers/UITests/SignalsViewController.m	
+++ b/Signal/src/view controllers/UITests/SignalsViewController.m	
@@ -427,8 +427,8 @@ static NSString* const kShowSignupFlowSegue = @"showSignupFlow";
         }
         else {
             _emptyBoxImage.image = [UIImage imageNamed:@"uiEmptyArchive"];
-            firstLine = @"Save conversations for reference.";
-            secondLine = @"You can swipe conversations into your Archive from the Inbox.";
+            firstLine = @"Clean Up Your Conversations.";
+            secondLine = @"You can archive inactive conversations for later from your Inbox.";
         }
     }
     NSMutableAttributedString *fullLabelString = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@\n%@",firstLine,secondLine]];