ContactDetail: Fix crash on parsedPhoneNumbers

.gitignore

@@ -9,4 +9,4 @@ build/*
 
 # Exclude user-specific XCode 3 and 4 files
 xcuserdata
-
+*.xccheckout

Podfile.lock

@@ -32,7 +32,7 @@ PODS:
     - CocoaLumberjack/Core
   - DJWActionSheet (1.0.4)
   - HKDFKit (0.0.3)
-  - JSQMessagesViewController (6.0-beta6):
+  - JSQMessagesViewController (6.0.0):
     - JSQSystemSoundPlayer (~> 2.0.0)
   - JSQSystemSoundPlayer (2.0.0)
   - libPhoneNumber-iOS (0.7.3)
@@ -83,7 +83,7 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   JSQMessagesViewController:
-    :commit: 21d877492e948f27fde4115573a809798cc78210
+    :commit: 597670e44663c9fa70b6a2deec2b19147c763048
     :git: https://github.com/dtsbourg/JSQMessagesViewController
   SocketRocket:
     :commit: d0585af165
@@ -96,7 +96,7 @@ SPEC CHECKSUMS:
   CocoaLumberjack: 205769c032b5fef85b92472046bcc8b7e7c8a817
   DJWActionSheet: d88b302d7c29523e1e9fb9b62cfac46f59bb90d9
   HKDFKit: 5998cf1bbb611e7ecc6bd3eaaef8c7a7da7be949
-  JSQMessagesViewController: 960a09d11978bea52d1a676e97980838f8d98652
+  JSQMessagesViewController: 49f449221a8f1da43403e6468ae2015fa0114a9e
   JSQSystemSoundPlayer: c98443b1cbb3b45db09d0d3d6c2355cf78294981
   libPhoneNumber-iOS: 98fc07d70c8fdb5e6a8e3442c37e97353065c20e
   Mantle: d7c5ac734579ec751c58fecbf56189853056c58c

Signal.xcodeproj/project.pbxproj

@@ -286,127 +286,40 @@
 		B60C16651988999D00E97A6C /* VersionMigrations.m in Sources */ = {isa = PBXBuildFile; fileRef = B60C16641988999D00E97A6C /* VersionMigrations.m */; };
 		B60EDE041A05A01700D73516 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B60EDE031A05A01700D73516 /* AudioToolbox.framework */; };
 		B633C5801A1D190B0059AC12 /* archive@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C4FE1A1D190B0059AC12 /* archive@2x.png */; };
-		B633C5811A1D190B0059AC12 /* archive_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C4FF1A1D190B0059AC12 /* archive_icon.png */; };
-		B633C5821A1D190B0059AC12 /* archive_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5001A1D190B0059AC12 /* archive_icon@2x.png */; };
 		B633C5831A1D190B0059AC12 /* backspace.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5011A1D190B0059AC12 /* backspace.png */; };
 		B633C5841A1D190B0059AC12 /* backspace@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5021A1D190B0059AC12 /* backspace@2x.png */; };
 		B633C5851A1D190B0059AC12 /* blue-archive@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5031A1D190B0059AC12 /* blue-archive@2x.png */; };
 		B633C5861A1D190B0059AC12 /* call@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5041A1D190B0059AC12 /* call@2x.png */; };
 		B633C5871A1D190B0059AC12 /* call_dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5051A1D190B0059AC12 /* call_dark@2x.png */; };
-		B633C5881A1D190B0059AC12 /* checkbox_checkmark.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5061A1D190B0059AC12 /* checkbox_checkmark.png */; };
-		B633C5891A1D190B0059AC12 /* checkbox_checkmark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5071A1D190B0059AC12 /* checkbox_checkmark@2x.png */; };
-		B633C58A1A1D190B0059AC12 /* checkbox_empty.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5081A1D190B0059AC12 /* checkbox_empty.png */; };
-		B633C58B1A1D190B0059AC12 /* checkbox_empty@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5091A1D190B0059AC12 /* checkbox_empty@2x.png */; };
 		B633C58C1A1D190B0059AC12 /* checkmark.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C50A1A1D190B0059AC12 /* checkmark.png */; };
 		B633C58D1A1D190B0059AC12 /* contact_default_feed.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C50B1A1D190B0059AC12 /* contact_default_feed.png */; };
-		B633C58E1A1D190B0059AC12 /* contacts.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C50C1A1D190B0059AC12 /* contacts.png */; };
 		B633C58F1A1D190B0059AC12 /* contacts@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C50D1A1D190B0059AC12 /* contacts@2x.png */; };
-		B633C5901A1D190B0059AC12 /* contacts_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C50E1A1D190B0059AC12 /* contacts_arrow.png */; };
-		B633C5911A1D190B0059AC12 /* contacts_arrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C50F1A1D190B0059AC12 /* contacts_arrow@2x.png */; };
 		B633C5921A1D190B0059AC12 /* contacts_tab@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5101A1D190B0059AC12 /* contacts_tab@2x.png */; };
 		B633C5961A1D190B0059AC12 /* DefaultContactImage.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5141A1D190B0059AC12 /* DefaultContactImage.png */; };
 		B633C5971A1D190B0059AC12 /* delete@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5151A1D190B0059AC12 /* delete@2x.png */; };
 		B633C5981A1D190B0059AC12 /* delete_history@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5161A1D190B0059AC12 /* delete_history@2x.png */; };
-		B633C5991A1D190B0059AC12 /* dismiss_notification_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5171A1D190B0059AC12 /* dismiss_notification_icon.png */; };
-		B633C59A1A1D190B0059AC12 /* dismiss_notification_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5181A1D190B0059AC12 /* dismiss_notification_icon@2x.png */; };
-		B633C59B1A1D190B0059AC12 /* drop_down_arrow_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5191A1D190B0059AC12 /* drop_down_arrow_icon.png */; };
-		B633C59C1A1D190B0059AC12 /* drop_down_arrow_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C51A1A1D190B0059AC12 /* drop_down_arrow_icon@2x.png */; };
 		B633C59D1A1D190B0059AC12 /* endcall@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C51B1A1D190B0059AC12 /* endcall@2x.png */; };
-		B633C59E1A1D190B0059AC12 /* expanded_cell_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C51C1A1D190B0059AC12 /* expanded_cell_icon.png */; };
-		B633C59F1A1D190B0059AC12 /* expanded_cell_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C51D1A1D190B0059AC12 /* expanded_cell_icon@2x.png */; };
-		B633C5A01A1D190B0059AC12 /* favourite.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C51E1A1D190B0059AC12 /* favourite.png */; };
-		B633C5A11A1D190B0059AC12 /* favourite_false_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C51F1A1D190B0059AC12 /* favourite_false_icon.png */; };
-		B633C5A21A1D190B0059AC12 /* favourite_false_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5201A1D190B0059AC12 /* favourite_false_icon@2x.png */; };
-		B633C5A31A1D190B0059AC12 /* favourite_true_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5211A1D190B0059AC12 /* favourite_true_icon.png */; };
-		B633C5A41A1D190B0059AC12 /* favourite_true_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5221A1D190B0059AC12 /* favourite_true_icon@2x.png */; };
-		B633C5A51A1D190B0059AC12 /* forward_button.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5231A1D190B0059AC12 /* forward_button.png */; };
-		B633C5A61A1D190B0059AC12 /* forward_button@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5241A1D190B0059AC12 /* forward_button@2x.png */; };
-		B633C5A71A1D190B0059AC12 /* home_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5251A1D190B0059AC12 /* home_icon.png */; };
-		B633C5A81A1D190B0059AC12 /* icon_contacts.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5261A1D190B0059AC12 /* icon_contacts.png */; };
-		B633C5A91A1D190B0059AC12 /* icon_favourites.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5271A1D190B0059AC12 /* icon_favourites.png */; };
-		B633C5AA1A1D190B0059AC12 /* icon_keypad.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5281A1D190B0059AC12 /* icon_keypad.png */; };
-		B633C5AB1A1D190B0059AC12 /* icon_recents.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5291A1D190B0059AC12 /* icon_recents.png */; };
-		B633C5AC1A1D190B0059AC12 /* in_call_phone_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C52A1A1D190B0059AC12 /* in_call_phone_icon.png */; };
-		B633C5AD1A1D190B0059AC12 /* in_call_phone_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C52B1A1D190B0059AC12 /* in_call_phone_icon@2x.png */; };
-		B633C5AE1A1D190B0059AC12 /* in_call_phrase_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C52C1A1D190B0059AC12 /* in_call_phrase_icon.png */; };
-		B633C5AF1A1D190B0059AC12 /* in_call_phrase_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C52D1A1D190B0059AC12 /* in_call_phrase_icon@2x.png */; };
-		B633C5B01A1D190B0059AC12 /* incoming_call_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C52E1A1D190B0059AC12 /* incoming_call_icon.png */; };
-		B633C5B11A1D190B0059AC12 /* incoming_call_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C52F1A1D190B0059AC12 /* incoming_call_icon@2x.png */; };
-		B633C5B21A1D190B0059AC12 /* info@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5301A1D190B0059AC12 /* info@2x.png */; };
 		B633C5B41A1D190B0059AC12 /* keypad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5321A1D190B0059AC12 /* keypad@2x.png */; };
 		B633C5B51A1D190B0059AC12 /* lock@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5331A1D190B0059AC12 /* lock@2x.png */; };
 		B633C5B61A1D190B0059AC12 /* lock_white@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5341A1D190B0059AC12 /* lock_white@2x.png */; };
 		B633C5B71A1D190B0059AC12 /* logo_intro@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5351A1D190B0059AC12 /* logo_intro@2x.png */; };
-		B633C5B91A1D190B0059AC12 /* menu_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5371A1D190B0059AC12 /* menu_icon.png */; };
-		B633C5BA1A1D190B0059AC12 /* menu_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5381A1D190B0059AC12 /* menu_icon@2x.png */; };
 		B633C5BB1A1D190B0059AC12 /* message_bubble.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5391A1D190B0059AC12 /* message_bubble.png */; };
 		B633C5BC1A1D190B0059AC12 /* message_bubble@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C53A1A1D190B0059AC12 /* message_bubble@2x.png */; };
-		B633C5BD1A1D190B0059AC12 /* message_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C53B1A1D190B0059AC12 /* message_icon.png */; };
 		B633C5BE1A1D190B0059AC12 /* missed.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C53C1A1D190B0059AC12 /* missed.png */; };
-		B633C5BF1A1D190B0059AC12 /* mute_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C53D1A1D190B0059AC12 /* mute_icon.png */; };
-		B633C5C01A1D190B0059AC12 /* mute_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C53E1A1D190B0059AC12 /* mute_icon@2x.png */; };
-		B633C5C11A1D190B0059AC12 /* mute_icon_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C53F1A1D190B0059AC12 /* mute_icon_selected.png */; };
-		B633C5C21A1D190B0059AC12 /* mute_icon_selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5401A1D190B0059AC12 /* mute_icon_selected@2x.png */; };
 		B633C5C31A1D190B0059AC12 /* mute_off@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5411A1D190B0059AC12 /* mute_off@2x.png */; };
 		B633C5C41A1D190B0059AC12 /* mute_on@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5421A1D190B0059AC12 /* mute_on@2x.png */; };
-		B633C5C51A1D190B0059AC12 /* notification_detail_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5431A1D190B0059AC12 /* notification_detail_icon.png */; };
-		B633C5C61A1D190B0059AC12 /* notification_detail_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5441A1D190B0059AC12 /* notification_detail_icon@2x.png */; };
-		B633C5C71A1D190B0059AC12 /* notification_mini_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5451A1D190B0059AC12 /* notification_mini_icon.png */; };
-		B633C5C81A1D190B0059AC12 /* notification_mini_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5461A1D190B0059AC12 /* notification_mini_icon@2x.png */; };
-		B633C5C91A1D190B0059AC12 /* outgoing_call_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5471A1D190B0059AC12 /* outgoing_call_icon.png */; };
-		B633C5CA1A1D190B0059AC12 /* outgoing_call_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5481A1D190B0059AC12 /* outgoing_call_icon@2x.png */; };
-		B633C5CB1A1D190B0059AC12 /* phone_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5491A1D190B0059AC12 /* phone_icon.png */; };
-		B633C5CC1A1D190B0059AC12 /* phone_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C54A1A1D190B0059AC12 /* phone_icon@2x.png */; };
 		B633C5CD1A1D190B0059AC12 /* photo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C54B1A1D190B0059AC12 /* photo@2x.png */; };
 		B633C5CE1A1D190B0059AC12 /* quit@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C54C1A1D190B0059AC12 /* quit@2x.png */; };
 		B633C5CF1A1D190B0059AC12 /* received.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C54D1A1D190B0059AC12 /* received.png */; };
 		B633C5D01A1D190B0059AC12 /* red-delete@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C54E1A1D190B0059AC12 /* red-delete@2x.png */; };
 		B633C5D11A1D190B0059AC12 /* reply.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C54F1A1D190B0059AC12 /* reply.png */; };
 		B633C5D21A1D190B0059AC12 /* savephoto@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5501A1D190B0059AC12 /* savephoto@2x.png */; };
-		B633C5D31A1D190B0059AC12 /* search_cancel.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5511A1D190B0059AC12 /* search_cancel.png */; };
-		B633C5D41A1D190B0059AC12 /* search_cancel@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5521A1D190B0059AC12 /* search_cancel@2x.png */; };
-		B633C5D51A1D190B0059AC12 /* search_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5531A1D190B0059AC12 /* search_icon.png */; };
-		B633C5D61A1D190B0059AC12 /* search_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5541A1D190B0059AC12 /* search_icon@2x.png */; };
-		B633C5D71A1D190B0059AC12 /* send_code_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5551A1D190B0059AC12 /* send_code_icon.png */; };
-		B633C5D81A1D190B0059AC12 /* send_code_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5561A1D190B0059AC12 /* send_code_icon@2x.png */; };
-		B633C5D91A1D190B0059AC12 /* settings.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5571A1D190B0059AC12 /* settings.png */; };
 		B633C5DA1A1D190B0059AC12 /* settings_dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5581A1D190B0059AC12 /* settings_dark@2x.png */; };
 		B633C5DB1A1D190B0059AC12 /* share@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5591A1D190B0059AC12 /* share@2x.png */; };
 		B633C5DC1A1D190B0059AC12 /* shred@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C55A1A1D190B0059AC12 /* shred@2x.png */; };
 		B633C5DF1A1D190B0059AC12 /* signal@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C55E1A1D190B0059AC12 /* signal@2x.png */; };
-		B633C5E01A1D190B0059AC12 /* signals.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C55F1A1D190B0059AC12 /* signals.png */; };
-		B633C5E11A1D190B0059AC12 /* speaker_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5601A1D190B0059AC12 /* speaker_icon.png */; };
-		B633C5E21A1D190B0059AC12 /* speaker_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5611A1D190B0059AC12 /* speaker_icon@2x.png */; };
-		B633C5E31A1D190B0059AC12 /* speaker_icon_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5621A1D190B0059AC12 /* speaker_icon_selected.png */; };
-		B633C5E41A1D190B0059AC12 /* speaker_icon_selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5631A1D190B0059AC12 /* speaker_icon_selected@2x.png */; };
 		B633C5E51A1D190B0059AC12 /* speaker_off@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5641A1D190B0059AC12 /* speaker_off@2x.png */; };
 		B633C5E61A1D190B0059AC12 /* speaker_on@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5651A1D190B0059AC12 /* speaker_on@2x.png */; };
-		B633C5E71A1D190B0059AC12 /* spinner_connecting.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5661A1D190B0059AC12 /* spinner_connecting.png */; };
-		B633C5E81A1D190B0059AC12 /* spinner_connecting@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5671A1D190B0059AC12 /* spinner_connecting@2x.png */; };
-		B633C5E91A1D190B0059AC12 /* spinner_connecting_flash.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5681A1D190B0059AC12 /* spinner_connecting_flash.png */; };
-		B633C5EA1A1D190B0059AC12 /* spinner_connecting_flash@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5691A1D190B0059AC12 /* spinner_connecting_flash@2x.png */; };
-		B633C5EB1A1D190B0059AC12 /* spinner_error.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C56A1A1D190B0059AC12 /* spinner_error.png */; };
-		B633C5EC1A1D190B0059AC12 /* spinner_error@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C56B1A1D190B0059AC12 /* spinner_error@2x.png */; };
-		B633C5ED1A1D190B0059AC12 /* spinner_ringing.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C56C1A1D190B0059AC12 /* spinner_ringing.png */; };
-		B633C5EE1A1D190B0059AC12 /* spinner_ringing@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C56D1A1D190B0059AC12 /* spinner_ringing@2x.png */; };
-		B633C5EF1A1D190B0059AC12 /* tab_icon_contacts.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C56E1A1D190B0059AC12 /* tab_icon_contacts.png */; };
-		B633C5F01A1D190B0059AC12 /* tab_icon_contacts@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C56F1A1D190B0059AC12 /* tab_icon_contacts@2x.png */; };
-		B633C5F11A1D190B0059AC12 /* tab_icon_favourites.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5701A1D190B0059AC12 /* tab_icon_favourites.png */; };
-		B633C5F21A1D190B0059AC12 /* tab_icon_favourites@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5711A1D190B0059AC12 /* tab_icon_favourites@2x.png */; };
-		B633C5F31A1D190B0059AC12 /* tab_icon_inbox.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5721A1D190B0059AC12 /* tab_icon_inbox.png */; };
-		B633C5F41A1D190B0059AC12 /* tab_icon_inbox@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5731A1D190B0059AC12 /* tab_icon_inbox@2x.png */; };
-		B633C5F51A1D190B0059AC12 /* tab_icon_keypad.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5741A1D190B0059AC12 /* tab_icon_keypad.png */; };
-		B633C5F61A1D190B0059AC12 /* tab_icon_keypad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5751A1D190B0059AC12 /* tab_icon_keypad@2x.png */; };
-		B633C5F71A1D190B0059AC12 /* tab_icon_menu.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5761A1D190B0059AC12 /* tab_icon_menu.png */; };
-		B633C5F81A1D190B0059AC12 /* tab_icon_menu@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5771A1D190B0059AC12 /* tab_icon_menu@2x.png */; };
-		B633C5F91A1D190B0059AC12 /* trash_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5781A1D190B0059AC12 /* trash_icon.png */; };
-		B633C5FA1A1D190B0059AC12 /* trash_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5791A1D190B0059AC12 /* trash_icon@2x.png */; };
-		B633C5FB1A1D190B0059AC12 /* volume_high.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C57A1A1D190B0059AC12 /* volume_high.png */; };
-		B633C5FC1A1D190B0059AC12 /* volume_high@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C57B1A1D190B0059AC12 /* volume_high@2x.png */; };
-		B633C5FD1A1D190B0059AC12 /* volume_low.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C57C1A1D190B0059AC12 /* volume_low.png */; };
-		B633C5FE1A1D190B0059AC12 /* volume_low@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C57D1A1D190B0059AC12 /* volume_low@2x.png */; };
-		B633C5FF1A1D190B0059AC12 /* whisper_notification_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C57E1A1D190B0059AC12 /* whisper_notification_icon.png */; };
-		B633C6001A1D190B0059AC12 /* whisper_notification_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C57F1A1D190B0059AC12 /* whisper_notification_icon@2x.png */; };
 		B63761E319E1F487005735D1 /* AFHTTPSessionManager+SignalMethods.m in Sources */ = {isa = PBXBuildFile; fileRef = B63761E219E1F487005735D1 /* AFHTTPSessionManager+SignalMethods.m */; };
 		B63761EC19E1FBE8005735D1 /* HttpRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = B63761E519E1FBE8005735D1 /* HttpRequest.m */; };
 		B63761ED19E1FBE8005735D1 /* HttpRequestOrResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = B63761E719E1FBE8005735D1 /* HttpRequestOrResponse.m */; };
@@ -447,7 +360,6 @@
 		B6B096631A1D25ED008BFAA6 /* TSPreKeyManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B095F11A1D25ED008BFAA6 /* TSPreKeyManager.m */; };
 		B6B096641A1D25ED008BFAA6 /* TSContactThread.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B095F51A1D25ED008BFAA6 /* TSContactThread.m */; };
 		B6B096651A1D25ED008BFAA6 /* TSGroupThread.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B095F71A1D25ED008BFAA6 /* TSGroupThread.m */; };
-		B6B096661A1D25ED008BFAA6 /* TSContact.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B095F91A1D25ED008BFAA6 /* TSContact.m */; };
 		B6B096671A1D25ED008BFAA6 /* TSGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B095FB1A1D25ED008BFAA6 /* TSGroup.m */; };
 		B6B096681A1D25ED008BFAA6 /* TSRecipient.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B095FD1A1D25ED008BFAA6 /* TSRecipient.m */; };
 		B6B096691A1D25ED008BFAA6 /* TSThread.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B095FF1A1D25ED008BFAA6 /* TSThread.m */; };
@@ -570,6 +482,10 @@
 		E197B62718BBF63B00F073E5 /* SoundBoard.m in Sources */ = {isa = PBXBuildFile; fileRef = E197B62618BBF63B00F073E5 /* SoundBoard.m */; };
 		E1CD329618BCFF9900B1A496 /* SoundInstance.m in Sources */ = {isa = PBXBuildFile; fileRef = E1CD329518BCFF9900B1A496 /* SoundInstance.m */; };
 		F995AC2FFD6D4442B012604A /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8313AE91B4954215858A5662 /* libPods.a */; };
+		FC15B7BF1A1F80F200F59801 /* defaultConctact_light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FC15B7BE1A1F80F200F59801 /* defaultConctact_light@2x.png */; };
+		FC1F90C01A22342B004F8253 /* group_photo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FC1F90BF1A22342B004F8253 /* group_photo@2x.png */; };
+		FC1F90C61A223991004F8253 /* settings_tab@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FC1F90C41A223991004F8253 /* settings_tab@2x.png */; };
+		FC1F90C71A223991004F8253 /* signals_tab@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FC1F90C51A223991004F8253 /* signals_tab@2x.png */; };
 		FC31962A1A067D8F0094C78E /* MessageComposeTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC3196291A067D8F0094C78E /* MessageComposeTableViewController.m */; };
 		FC31962D1A06A2190094C78E /* FingerprintViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC31962C1A06A2190094C78E /* FingerprintViewController.m */; };
 		FC3196301A0814130094C78E /* SettingsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC31962F1A0814130094C78E /* SettingsTableViewController.m */; };
@@ -939,127 +855,40 @@
 		B60C16641988999D00E97A6C /* VersionMigrations.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VersionMigrations.m; sourceTree = "<group>"; };
 		B60EDE031A05A01700D73516 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		B633C4FE1A1D190B0059AC12 /* archive@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "archive@2x.png"; sourceTree = "<group>"; };
-		B633C4FF1A1D190B0059AC12 /* archive_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = archive_icon.png; sourceTree = "<group>"; };
-		B633C5001A1D190B0059AC12 /* archive_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "archive_icon@2x.png"; sourceTree = "<group>"; };
 		B633C5011A1D190B0059AC12 /* backspace.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = backspace.png; sourceTree = "<group>"; };
 		B633C5021A1D190B0059AC12 /* backspace@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backspace@2x.png"; sourceTree = "<group>"; };
 		B633C5031A1D190B0059AC12 /* blue-archive@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "blue-archive@2x.png"; sourceTree = "<group>"; };
 		B633C5041A1D190B0059AC12 /* call@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "call@2x.png"; sourceTree = "<group>"; };
 		B633C5051A1D190B0059AC12 /* call_dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "call_dark@2x.png"; sourceTree = "<group>"; };
-		B633C5061A1D190B0059AC12 /* checkbox_checkmark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = checkbox_checkmark.png; sourceTree = "<group>"; };
-		B633C5071A1D190B0059AC12 /* checkbox_checkmark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "checkbox_checkmark@2x.png"; sourceTree = "<group>"; };
-		B633C5081A1D190B0059AC12 /* checkbox_empty.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = checkbox_empty.png; sourceTree = "<group>"; };
-		B633C5091A1D190B0059AC12 /* checkbox_empty@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "checkbox_empty@2x.png"; sourceTree = "<group>"; };
 		B633C50A1A1D190B0059AC12 /* checkmark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = checkmark.png; sourceTree = "<group>"; };
 		B633C50B1A1D190B0059AC12 /* contact_default_feed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = contact_default_feed.png; sourceTree = "<group>"; };
-		B633C50C1A1D190B0059AC12 /* contacts.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = contacts.png; sourceTree = "<group>"; };
 		B633C50D1A1D190B0059AC12 /* contacts@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "contacts@2x.png"; sourceTree = "<group>"; };
-		B633C50E1A1D190B0059AC12 /* contacts_arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = contacts_arrow.png; sourceTree = "<group>"; };
-		B633C50F1A1D190B0059AC12 /* contacts_arrow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "contacts_arrow@2x.png"; sourceTree = "<group>"; };
 		B633C5101A1D190B0059AC12 /* contacts_tab@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "contacts_tab@2x.png"; sourceTree = "<group>"; };
 		B633C5141A1D190B0059AC12 /* DefaultContactImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DefaultContactImage.png; sourceTree = "<group>"; };
 		B633C5151A1D190B0059AC12 /* delete@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "delete@2x.png"; sourceTree = "<group>"; };
 		B633C5161A1D190B0059AC12 /* delete_history@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "delete_history@2x.png"; sourceTree = "<group>"; };
-		B633C5171A1D190B0059AC12 /* dismiss_notification_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dismiss_notification_icon.png; sourceTree = "<group>"; };
-		B633C5181A1D190B0059AC12 /* dismiss_notification_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "dismiss_notification_icon@2x.png"; sourceTree = "<group>"; };
-		B633C5191A1D190B0059AC12 /* drop_down_arrow_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = drop_down_arrow_icon.png; sourceTree = "<group>"; };
-		B633C51A1A1D190B0059AC12 /* drop_down_arrow_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "drop_down_arrow_icon@2x.png"; sourceTree = "<group>"; };
 		B633C51B1A1D190B0059AC12 /* endcall@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "endcall@2x.png"; sourceTree = "<group>"; };
-		B633C51C1A1D190B0059AC12 /* expanded_cell_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = expanded_cell_icon.png; sourceTree = "<group>"; };
-		B633C51D1A1D190B0059AC12 /* expanded_cell_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "expanded_cell_icon@2x.png"; sourceTree = "<group>"; };
-		B633C51E1A1D190B0059AC12 /* favourite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = favourite.png; sourceTree = "<group>"; };
-		B633C51F1A1D190B0059AC12 /* favourite_false_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = favourite_false_icon.png; sourceTree = "<group>"; };
-		B633C5201A1D190B0059AC12 /* favourite_false_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "favourite_false_icon@2x.png"; sourceTree = "<group>"; };
-		B633C5211A1D190B0059AC12 /* favourite_true_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = favourite_true_icon.png; sourceTree = "<group>"; };
-		B633C5221A1D190B0059AC12 /* favourite_true_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "favourite_true_icon@2x.png"; sourceTree = "<group>"; };
-		B633C5231A1D190B0059AC12 /* forward_button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = forward_button.png; sourceTree = "<group>"; };
-		B633C5241A1D190B0059AC12 /* forward_button@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "forward_button@2x.png"; sourceTree = "<group>"; };
-		B633C5251A1D190B0059AC12 /* home_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = home_icon.png; sourceTree = "<group>"; };
-		B633C5261A1D190B0059AC12 /* icon_contacts.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_contacts.png; sourceTree = "<group>"; };
-		B633C5271A1D190B0059AC12 /* icon_favourites.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_favourites.png; sourceTree = "<group>"; };
-		B633C5281A1D190B0059AC12 /* icon_keypad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_keypad.png; sourceTree = "<group>"; };
-		B633C5291A1D190B0059AC12 /* icon_recents.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_recents.png; sourceTree = "<group>"; };
-		B633C52A1A1D190B0059AC12 /* in_call_phone_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = in_call_phone_icon.png; sourceTree = "<group>"; };
-		B633C52B1A1D190B0059AC12 /* in_call_phone_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "in_call_phone_icon@2x.png"; sourceTree = "<group>"; };
-		B633C52C1A1D190B0059AC12 /* in_call_phrase_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = in_call_phrase_icon.png; sourceTree = "<group>"; };
-		B633C52D1A1D190B0059AC12 /* in_call_phrase_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "in_call_phrase_icon@2x.png"; sourceTree = "<group>"; };
-		B633C52E1A1D190B0059AC12 /* incoming_call_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = incoming_call_icon.png; sourceTree = "<group>"; };
-		B633C52F1A1D190B0059AC12 /* incoming_call_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "incoming_call_icon@2x.png"; sourceTree = "<group>"; };
-		B633C5301A1D190B0059AC12 /* info@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "info@2x.png"; sourceTree = "<group>"; };
 		B633C5321A1D190B0059AC12 /* keypad@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "keypad@2x.png"; sourceTree = "<group>"; };
 		B633C5331A1D190B0059AC12 /* lock@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lock@2x.png"; sourceTree = "<group>"; };
 		B633C5341A1D190B0059AC12 /* lock_white@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lock_white@2x.png"; sourceTree = "<group>"; };
 		B633C5351A1D190B0059AC12 /* logo_intro@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo_intro@2x.png"; sourceTree = "<group>"; };
-		B633C5371A1D190B0059AC12 /* menu_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_icon.png; sourceTree = "<group>"; };
-		B633C5381A1D190B0059AC12 /* menu_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menu_icon@2x.png"; sourceTree = "<group>"; };
 		B633C5391A1D190B0059AC12 /* message_bubble.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = message_bubble.png; sourceTree = "<group>"; };
 		B633C53A1A1D190B0059AC12 /* message_bubble@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "message_bubble@2x.png"; sourceTree = "<group>"; };
-		B633C53B1A1D190B0059AC12 /* message_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = message_icon.png; sourceTree = "<group>"; };
 		B633C53C1A1D190B0059AC12 /* missed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = missed.png; sourceTree = "<group>"; };
-		B633C53D1A1D190B0059AC12 /* mute_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mute_icon.png; sourceTree = "<group>"; };
-		B633C53E1A1D190B0059AC12 /* mute_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mute_icon@2x.png"; sourceTree = "<group>"; };
-		B633C53F1A1D190B0059AC12 /* mute_icon_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mute_icon_selected.png; sourceTree = "<group>"; };
-		B633C5401A1D190B0059AC12 /* mute_icon_selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mute_icon_selected@2x.png"; sourceTree = "<group>"; };
 		B633C5411A1D190B0059AC12 /* mute_off@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mute_off@2x.png"; sourceTree = "<group>"; };
 		B633C5421A1D190B0059AC12 /* mute_on@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mute_on@2x.png"; sourceTree = "<group>"; };
-		B633C5431A1D190B0059AC12 /* notification_detail_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = notification_detail_icon.png; sourceTree = "<group>"; };
-		B633C5441A1D190B0059AC12 /* notification_detail_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "notification_detail_icon@2x.png"; sourceTree = "<group>"; };
-		B633C5451A1D190B0059AC12 /* notification_mini_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = notification_mini_icon.png; sourceTree = "<group>"; };
-		B633C5461A1D190B0059AC12 /* notification_mini_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "notification_mini_icon@2x.png"; sourceTree = "<group>"; };
-		B633C5471A1D190B0059AC12 /* outgoing_call_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = outgoing_call_icon.png; sourceTree = "<group>"; };
-		B633C5481A1D190B0059AC12 /* outgoing_call_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "outgoing_call_icon@2x.png"; sourceTree = "<group>"; };
-		B633C5491A1D190B0059AC12 /* phone_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = phone_icon.png; sourceTree = "<group>"; };
-		B633C54A1A1D190B0059AC12 /* phone_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "phone_icon@2x.png"; sourceTree = "<group>"; };
 		B633C54B1A1D190B0059AC12 /* photo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "photo@2x.png"; sourceTree = "<group>"; };
 		B633C54C1A1D190B0059AC12 /* quit@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "quit@2x.png"; sourceTree = "<group>"; };
 		B633C54D1A1D190B0059AC12 /* received.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = received.png; sourceTree = "<group>"; };
 		B633C54E1A1D190B0059AC12 /* red-delete@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "red-delete@2x.png"; sourceTree = "<group>"; };
 		B633C54F1A1D190B0059AC12 /* reply.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = reply.png; sourceTree = "<group>"; };
 		B633C5501A1D190B0059AC12 /* savephoto@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "savephoto@2x.png"; sourceTree = "<group>"; };
-		B633C5511A1D190B0059AC12 /* search_cancel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = search_cancel.png; sourceTree = "<group>"; };
-		B633C5521A1D190B0059AC12 /* search_cancel@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "search_cancel@2x.png"; sourceTree = "<group>"; };
-		B633C5531A1D190B0059AC12 /* search_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = search_icon.png; sourceTree = "<group>"; };
-		B633C5541A1D190B0059AC12 /* search_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "search_icon@2x.png"; sourceTree = "<group>"; };
-		B633C5551A1D190B0059AC12 /* send_code_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = send_code_icon.png; sourceTree = "<group>"; };
-		B633C5561A1D190B0059AC12 /* send_code_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "send_code_icon@2x.png"; sourceTree = "<group>"; };
-		B633C5571A1D190B0059AC12 /* settings.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = settings.png; sourceTree = "<group>"; };
 		B633C5581A1D190B0059AC12 /* settings_dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings_dark@2x.png"; sourceTree = "<group>"; };
 		B633C5591A1D190B0059AC12 /* share@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "share@2x.png"; sourceTree = "<group>"; };
 		B633C55A1A1D190B0059AC12 /* shred@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "shred@2x.png"; sourceTree = "<group>"; };
 		B633C55E1A1D190B0059AC12 /* signal@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "signal@2x.png"; sourceTree = "<group>"; };
-		B633C55F1A1D190B0059AC12 /* signals.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = signals.png; sourceTree = "<group>"; };
-		B633C5601A1D190B0059AC12 /* speaker_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = speaker_icon.png; sourceTree = "<group>"; };
-		B633C5611A1D190B0059AC12 /* speaker_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "speaker_icon@2x.png"; sourceTree = "<group>"; };
-		B633C5621A1D190B0059AC12 /* speaker_icon_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = speaker_icon_selected.png; sourceTree = "<group>"; };
-		B633C5631A1D190B0059AC12 /* speaker_icon_selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "speaker_icon_selected@2x.png"; sourceTree = "<group>"; };
 		B633C5641A1D190B0059AC12 /* speaker_off@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "speaker_off@2x.png"; sourceTree = "<group>"; };
 		B633C5651A1D190B0059AC12 /* speaker_on@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "speaker_on@2x.png"; sourceTree = "<group>"; };
-		B633C5661A1D190B0059AC12 /* spinner_connecting.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spinner_connecting.png; sourceTree = "<group>"; };
-		B633C5671A1D190B0059AC12 /* spinner_connecting@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "spinner_connecting@2x.png"; sourceTree = "<group>"; };
-		B633C5681A1D190B0059AC12 /* spinner_connecting_flash.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spinner_connecting_flash.png; sourceTree = "<group>"; };
-		B633C5691A1D190B0059AC12 /* spinner_connecting_flash@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "spinner_connecting_flash@2x.png"; sourceTree = "<group>"; };
-		B633C56A1A1D190B0059AC12 /* spinner_error.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spinner_error.png; sourceTree = "<group>"; };
-		B633C56B1A1D190B0059AC12 /* spinner_error@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "spinner_error@2x.png"; sourceTree = "<group>"; };
-		B633C56C1A1D190B0059AC12 /* spinner_ringing.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spinner_ringing.png; sourceTree = "<group>"; };
-		B633C56D1A1D190B0059AC12 /* spinner_ringing@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "spinner_ringing@2x.png"; sourceTree = "<group>"; };
-		B633C56E1A1D190B0059AC12 /* tab_icon_contacts.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tab_icon_contacts.png; sourceTree = "<group>"; };
-		B633C56F1A1D190B0059AC12 /* tab_icon_contacts@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_icon_contacts@2x.png"; sourceTree = "<group>"; };
-		B633C5701A1D190B0059AC12 /* tab_icon_favourites.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tab_icon_favourites.png; sourceTree = "<group>"; };
-		B633C5711A1D190B0059AC12 /* tab_icon_favourites@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_icon_favourites@2x.png"; sourceTree = "<group>"; };
-		B633C5721A1D190B0059AC12 /* tab_icon_inbox.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tab_icon_inbox.png; sourceTree = "<group>"; };
-		B633C5731A1D190B0059AC12 /* tab_icon_inbox@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_icon_inbox@2x.png"; sourceTree = "<group>"; };
-		B633C5741A1D190B0059AC12 /* tab_icon_keypad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tab_icon_keypad.png; sourceTree = "<group>"; };
-		B633C5751A1D190B0059AC12 /* tab_icon_keypad@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_icon_keypad@2x.png"; sourceTree = "<group>"; };
-		B633C5761A1D190B0059AC12 /* tab_icon_menu.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tab_icon_menu.png; sourceTree = "<group>"; };
-		B633C5771A1D190B0059AC12 /* tab_icon_menu@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_icon_menu@2x.png"; sourceTree = "<group>"; };
-		B633C5781A1D190B0059AC12 /* trash_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = trash_icon.png; sourceTree = "<group>"; };
-		B633C5791A1D190B0059AC12 /* trash_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "trash_icon@2x.png"; sourceTree = "<group>"; };
-		B633C57A1A1D190B0059AC12 /* volume_high.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = volume_high.png; sourceTree = "<group>"; };
-		B633C57B1A1D190B0059AC12 /* volume_high@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "volume_high@2x.png"; sourceTree = "<group>"; };
-		B633C57C1A1D190B0059AC12 /* volume_low.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = volume_low.png; sourceTree = "<group>"; };
-		B633C57D1A1D190B0059AC12 /* volume_low@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "volume_low@2x.png"; sourceTree = "<group>"; };
-		B633C57E1A1D190B0059AC12 /* whisper_notification_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = whisper_notification_icon.png; sourceTree = "<group>"; };
-		B633C57F1A1D190B0059AC12 /* whisper_notification_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "whisper_notification_icon@2x.png"; sourceTree = "<group>"; };
 		B63761E119E1F487005735D1 /* AFHTTPSessionManager+SignalMethods.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "AFHTTPSessionManager+SignalMethods.h"; sourceTree = "<group>"; };
 		B63761E219E1F487005735D1 /* AFHTTPSessionManager+SignalMethods.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "AFHTTPSessionManager+SignalMethods.m"; sourceTree = "<group>"; };
 		B63761E419E1FBE8005735D1 /* HttpRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpRequest.h; sourceTree = "<group>"; };
@@ -1168,14 +997,12 @@
 		B6B095F51A1D25ED008BFAA6 /* TSContactThread.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSContactThread.m; sourceTree = "<group>"; };
 		B6B095F61A1D25ED008BFAA6 /* TSGroupThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSGroupThread.h; sourceTree = "<group>"; };
 		B6B095F71A1D25ED008BFAA6 /* TSGroupThread.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSGroupThread.m; sourceTree = "<group>"; };
-		B6B095F81A1D25ED008BFAA6 /* TSContact.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSContact.h; sourceTree = "<group>"; };
-		B6B095F91A1D25ED008BFAA6 /* TSContact.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSContact.m; sourceTree = "<group>"; };
 		B6B095FA1A1D25ED008BFAA6 /* TSGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSGroup.h; sourceTree = "<group>"; };
 		B6B095FB1A1D25ED008BFAA6 /* TSGroup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSGroup.m; sourceTree = "<group>"; };
 		B6B095FC1A1D25ED008BFAA6 /* TSRecipient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSRecipient.h; sourceTree = "<group>"; };
 		B6B095FD1A1D25ED008BFAA6 /* TSRecipient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSRecipient.m; sourceTree = "<group>"; };
-		B6B095FE1A1D25ED008BFAA6 /* TSThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSThread.h; sourceTree = "<group>"; };
-		B6B095FF1A1D25ED008BFAA6 /* TSThread.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSThread.m; sourceTree = "<group>"; };
+		B6B095FE1A1D25ED008BFAA6 /* TSThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TSThread.h; path = ../TSThread.h; sourceTree = "<group>"; };
+		B6B095FF1A1D25ED008BFAA6 /* TSThread.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSThread.m; path = ../TSThread.m; sourceTree = "<group>"; };
 		B6B096011A1D25ED008BFAA6 /* IncomingPushMessageSignal.pb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IncomingPushMessageSignal.pb.h; sourceTree = "<group>"; };
 		B6B096021A1D25ED008BFAA6 /* IncomingPushMessageSignal.pb.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IncomingPushMessageSignal.pb.m; sourceTree = "<group>"; };
 		B6B096031A1D25ED008BFAA6 /* TSAttachement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSAttachement.h; sourceTree = "<group>"; };
@@ -1349,6 +1176,10 @@
 		E1C407C117F0C246007BEE65 /* whisperReal.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = whisperReal.cer; sourceTree = "<group>"; };
 		E1CD329418BCFF9900B1A496 /* SoundInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoundInstance.h; sourceTree = "<group>"; };
 		E1CD329518BCFF9900B1A496 /* SoundInstance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SoundInstance.m; sourceTree = "<group>"; };
+		FC15B7BE1A1F80F200F59801 /* defaultConctact_light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "defaultConctact_light@2x.png"; sourceTree = "<group>"; };
+		FC1F90BF1A22342B004F8253 /* group_photo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "group_photo@2x.png"; sourceTree = "<group>"; };
+		FC1F90C41A223991004F8253 /* settings_tab@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings_tab@2x.png"; sourceTree = "<group>"; };
+		FC1F90C51A223991004F8253 /* signals_tab@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "signals_tab@2x.png"; sourceTree = "<group>"; };
 		FC3196281A067D8F0094C78E /* MessageComposeTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageComposeTableViewController.h; sourceTree = "<group>"; };
 		FC3196291A067D8F0094C78E /* MessageComposeTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageComposeTableViewController.m; sourceTree = "<group>"; };
 		FC31962B1A06A2190094C78E /* FingerprintViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FingerprintViewController.h; sourceTree = "<group>"; };
@@ -1558,6 +1389,7 @@
 		76EB040318170B33006006FC /* contact */ = {
 			isa = PBXGroup;
 			children = (
+				76EB04A818170B33006006FC /* number directory */,
 				76EB040418170B33006006FC /* Contact.h */,
 				76EB040518170B33006006FC /* Contact.m */,
 				76EB040818170B33006006FC /* ContactsManager.h */,
@@ -1847,7 +1679,6 @@
 				76EB04A518170B33006006FC /* InitiateSignal.proto */,
 				76EB04A618170B33006006FC /* InitiatorSessionDescriptor.h */,
 				76EB04A718170B33006006FC /* InitiatorSessionDescriptor.m */,
-				76EB04A818170B33006006FC /* number directory */,
 				76EB04AD18170B33006006FC /* ResponderSessionDescriptor.h */,
 				76EB04AE18170B33006006FC /* ResponderSessionDescriptor.m */,
 				76EB04AF18170B33006006FC /* SignalUtil.h */,
@@ -1864,7 +1695,8 @@
 				76EB04AB18170B33006006FC /* PhoneNumberDirectoryFilterManager.h */,
 				76EB04AC18170B33006006FC /* PhoneNumberDirectoryFilterManager.m */,
 			);
-			path = "number directory";
+			name = "number directory";
+			path = "../phone/signaling/number directory";
 			sourceTree = "<group>";
 		};
 		76EB04B118170B33006006FC /* profiling */ = {
@@ -2255,127 +2087,44 @@
 			isa = PBXGroup;
 			children = (
 				B633C4FE1A1D190B0059AC12 /* archive@2x.png */,
-				B633C4FF1A1D190B0059AC12 /* archive_icon.png */,
-				B633C5001A1D190B0059AC12 /* archive_icon@2x.png */,
 				B633C5011A1D190B0059AC12 /* backspace.png */,
 				B633C5021A1D190B0059AC12 /* backspace@2x.png */,
 				B633C5031A1D190B0059AC12 /* blue-archive@2x.png */,
 				B633C5041A1D190B0059AC12 /* call@2x.png */,
 				B633C5051A1D190B0059AC12 /* call_dark@2x.png */,
-				B633C5061A1D190B0059AC12 /* checkbox_checkmark.png */,
-				B633C5071A1D190B0059AC12 /* checkbox_checkmark@2x.png */,
-				B633C5081A1D190B0059AC12 /* checkbox_empty.png */,
-				B633C5091A1D190B0059AC12 /* checkbox_empty@2x.png */,
 				B633C50A1A1D190B0059AC12 /* checkmark.png */,
 				B633C50B1A1D190B0059AC12 /* contact_default_feed.png */,
-				B633C50C1A1D190B0059AC12 /* contacts.png */,
 				B633C50D1A1D190B0059AC12 /* contacts@2x.png */,
-				B633C50E1A1D190B0059AC12 /* contacts_arrow.png */,
-				B633C50F1A1D190B0059AC12 /* contacts_arrow@2x.png */,
 				B633C5101A1D190B0059AC12 /* contacts_tab@2x.png */,
 				B633C5141A1D190B0059AC12 /* DefaultContactImage.png */,
+				FC15B7BE1A1F80F200F59801 /* defaultConctact_light@2x.png */,
 				B633C5151A1D190B0059AC12 /* delete@2x.png */,
 				B633C5161A1D190B0059AC12 /* delete_history@2x.png */,
-				B633C5171A1D190B0059AC12 /* dismiss_notification_icon.png */,
-				B633C5181A1D190B0059AC12 /* dismiss_notification_icon@2x.png */,
-				B633C5191A1D190B0059AC12 /* drop_down_arrow_icon.png */,
-				B633C51A1A1D190B0059AC12 /* drop_down_arrow_icon@2x.png */,
 				B633C51B1A1D190B0059AC12 /* endcall@2x.png */,
-				B633C51C1A1D190B0059AC12 /* expanded_cell_icon.png */,
-				B633C51D1A1D190B0059AC12 /* expanded_cell_icon@2x.png */,
-				B633C51E1A1D190B0059AC12 /* favourite.png */,
-				B633C51F1A1D190B0059AC12 /* favourite_false_icon.png */,
-				B633C5201A1D190B0059AC12 /* favourite_false_icon@2x.png */,
-				B633C5211A1D190B0059AC12 /* favourite_true_icon.png */,
-				B633C5221A1D190B0059AC12 /* favourite_true_icon@2x.png */,
-				B633C5231A1D190B0059AC12 /* forward_button.png */,
-				B633C5241A1D190B0059AC12 /* forward_button@2x.png */,
-				B633C5251A1D190B0059AC12 /* home_icon.png */,
-				B633C5261A1D190B0059AC12 /* icon_contacts.png */,
-				B633C5271A1D190B0059AC12 /* icon_favourites.png */,
-				B633C5281A1D190B0059AC12 /* icon_keypad.png */,
-				B633C5291A1D190B0059AC12 /* icon_recents.png */,
-				B633C52A1A1D190B0059AC12 /* in_call_phone_icon.png */,
-				B633C52B1A1D190B0059AC12 /* in_call_phone_icon@2x.png */,
-				B633C52C1A1D190B0059AC12 /* in_call_phrase_icon.png */,
-				B633C52D1A1D190B0059AC12 /* in_call_phrase_icon@2x.png */,
-				B633C52E1A1D190B0059AC12 /* incoming_call_icon.png */,
-				B633C52F1A1D190B0059AC12 /* incoming_call_icon@2x.png */,
-				B633C5301A1D190B0059AC12 /* info@2x.png */,
+				FC1F90BF1A22342B004F8253 /* group_photo@2x.png */,
 				B633C5321A1D190B0059AC12 /* keypad@2x.png */,
 				B633C5331A1D190B0059AC12 /* lock@2x.png */,
 				B633C5341A1D190B0059AC12 /* lock_white@2x.png */,
 				B633C5351A1D190B0059AC12 /* logo_intro@2x.png */,
-				B633C5371A1D190B0059AC12 /* menu_icon.png */,
-				B633C5381A1D190B0059AC12 /* menu_icon@2x.png */,
 				B633C5391A1D190B0059AC12 /* message_bubble.png */,
 				B633C53A1A1D190B0059AC12 /* message_bubble@2x.png */,
-				B633C53B1A1D190B0059AC12 /* message_icon.png */,
 				B633C53C1A1D190B0059AC12 /* missed.png */,
-				B633C53D1A1D190B0059AC12 /* mute_icon.png */,
-				B633C53E1A1D190B0059AC12 /* mute_icon@2x.png */,
-				B633C53F1A1D190B0059AC12 /* mute_icon_selected.png */,
-				B633C5401A1D190B0059AC12 /* mute_icon_selected@2x.png */,
 				B633C5411A1D190B0059AC12 /* mute_off@2x.png */,
 				B633C5421A1D190B0059AC12 /* mute_on@2x.png */,
-				B633C5431A1D190B0059AC12 /* notification_detail_icon.png */,
-				B633C5441A1D190B0059AC12 /* notification_detail_icon@2x.png */,
-				B633C5451A1D190B0059AC12 /* notification_mini_icon.png */,
-				B633C5461A1D190B0059AC12 /* notification_mini_icon@2x.png */,
-				B633C5471A1D190B0059AC12 /* outgoing_call_icon.png */,
-				B633C5481A1D190B0059AC12 /* outgoing_call_icon@2x.png */,
-				B633C5491A1D190B0059AC12 /* phone_icon.png */,
-				B633C54A1A1D190B0059AC12 /* phone_icon@2x.png */,
 				B633C54B1A1D190B0059AC12 /* photo@2x.png */,
 				B633C54C1A1D190B0059AC12 /* quit@2x.png */,
 				B633C54D1A1D190B0059AC12 /* received.png */,
 				B633C54E1A1D190B0059AC12 /* red-delete@2x.png */,
 				B633C54F1A1D190B0059AC12 /* reply.png */,
 				B633C5501A1D190B0059AC12 /* savephoto@2x.png */,
-				B633C5511A1D190B0059AC12 /* search_cancel.png */,
-				B633C5521A1D190B0059AC12 /* search_cancel@2x.png */,
-				B633C5531A1D190B0059AC12 /* search_icon.png */,
-				B633C5541A1D190B0059AC12 /* search_icon@2x.png */,
-				B633C5551A1D190B0059AC12 /* send_code_icon.png */,
-				B633C5561A1D190B0059AC12 /* send_code_icon@2x.png */,
-				B633C5571A1D190B0059AC12 /* settings.png */,
 				B633C5581A1D190B0059AC12 /* settings_dark@2x.png */,
+				FC1F90C41A223991004F8253 /* settings_tab@2x.png */,
 				B633C5591A1D190B0059AC12 /* share@2x.png */,
 				B633C55A1A1D190B0059AC12 /* shred@2x.png */,
 				B633C55E1A1D190B0059AC12 /* signal@2x.png */,
-				B633C55F1A1D190B0059AC12 /* signals.png */,
-				B633C5601A1D190B0059AC12 /* speaker_icon.png */,
-				B633C5611A1D190B0059AC12 /* speaker_icon@2x.png */,
-				B633C5621A1D190B0059AC12 /* speaker_icon_selected.png */,
-				B633C5631A1D190B0059AC12 /* speaker_icon_selected@2x.png */,
+				FC1F90C51A223991004F8253 /* signals_tab@2x.png */,
 				B633C5641A1D190B0059AC12 /* speaker_off@2x.png */,
 				B633C5651A1D190B0059AC12 /* speaker_on@2x.png */,
-				B633C5661A1D190B0059AC12 /* spinner_connecting.png */,
-				B633C5671A1D190B0059AC12 /* spinner_connecting@2x.png */,
-				B633C5681A1D190B0059AC12 /* spinner_connecting_flash.png */,
-				B633C5691A1D190B0059AC12 /* spinner_connecting_flash@2x.png */,
-				B633C56A1A1D190B0059AC12 /* spinner_error.png */,
-				B633C56B1A1D190B0059AC12 /* spinner_error@2x.png */,
-				B633C56C1A1D190B0059AC12 /* spinner_ringing.png */,
-				B633C56D1A1D190B0059AC12 /* spinner_ringing@2x.png */,
-				B633C56E1A1D190B0059AC12 /* tab_icon_contacts.png */,
-				B633C56F1A1D190B0059AC12 /* tab_icon_contacts@2x.png */,
-				B633C5701A1D190B0059AC12 /* tab_icon_favourites.png */,
-				B633C5711A1D190B0059AC12 /* tab_icon_favourites@2x.png */,
-				B633C5721A1D190B0059AC12 /* tab_icon_inbox.png */,
-				B633C5731A1D190B0059AC12 /* tab_icon_inbox@2x.png */,
-				B633C5741A1D190B0059AC12 /* tab_icon_keypad.png */,
-				B633C5751A1D190B0059AC12 /* tab_icon_keypad@2x.png */,
-				B633C5761A1D190B0059AC12 /* tab_icon_menu.png */,
-				B633C5771A1D190B0059AC12 /* tab_icon_menu@2x.png */,
-				B633C5781A1D190B0059AC12 /* trash_icon.png */,
-				B633C5791A1D190B0059AC12 /* trash_icon@2x.png */,
-				B633C57A1A1D190B0059AC12 /* volume_high.png */,
-				B633C57B1A1D190B0059AC12 /* volume_high@2x.png */,
-				B633C57C1A1D190B0059AC12 /* volume_low.png */,
-				B633C57D1A1D190B0059AC12 /* volume_low@2x.png */,
-				B633C57E1A1D190B0059AC12 /* whisper_notification_icon.png */,
-				B633C57F1A1D190B0059AC12 /* whisper_notification_icon@2x.png */,
 			);
 			path = Images;
 			sourceTree = "<group>";
@@ -2855,14 +2604,10 @@
 			isa = PBXGroup;
 			children = (
 				B6B095F31A1D25ED008BFAA6 /* Threads */,
-				B6B095F81A1D25ED008BFAA6 /* TSContact.h */,
-				B6B095F91A1D25ED008BFAA6 /* TSContact.m */,
 				B6B095FA1A1D25ED008BFAA6 /* TSGroup.h */,
 				B6B095FB1A1D25ED008BFAA6 /* TSGroup.m */,
 				B6B095FC1A1D25ED008BFAA6 /* TSRecipient.h */,
 				B6B095FD1A1D25ED008BFAA6 /* TSRecipient.m */,
-				B6B095FE1A1D25ED008BFAA6 /* TSThread.h */,
-				B6B095FF1A1D25ED008BFAA6 /* TSThread.m */,
 			);
 			path = Contacts;
 			sourceTree = "<group>";
@@ -2874,6 +2619,8 @@
 				B6B095F51A1D25ED008BFAA6 /* TSContactThread.m */,
 				B6B095F61A1D25ED008BFAA6 /* TSGroupThread.h */,
 				B6B095F71A1D25ED008BFAA6 /* TSGroupThread.m */,
+				B6B095FE1A1D25ED008BFAA6 /* TSThread.h */,
+				B6B095FF1A1D25ED008BFAA6 /* TSThread.m */,
 			);
 			path = Threads;
 			sourceTree = "<group>";
@@ -3353,7 +3100,7 @@
 				ORGANIZATIONNAME = "Open Whisper Systems";
 				TargetAttributes = {
 					D221A088169C9E5E00537ABF = {
-						DevelopmentTeam = U68MSDN6DR;
+						DevelopmentTeam = DRXTS3ZU8M;
 						SystemCapabilities = {
 							com.apple.DataProtection = {
 								enabled = 1;
@@ -3467,154 +3214,71 @@
 			files = (
 				E148750018A06966002CC4F3 /* CallAudioManagerDemo.xib in Resources */,
 				B633C5DC1A1D190B0059AC12 /* shred@2x.png in Resources */,
-				B633C5E91A1D190B0059AC12 /* spinner_connecting_flash.png in Resources */,
 				B633C5E61A1D190B0059AC12 /* speaker_on@2x.png in Resources */,
 				B633C5BB1A1D190B0059AC12 /* message_bubble.png in Resources */,
 				B633C5B51A1D190B0059AC12 /* lock@2x.png in Resources */,
-				B633C58E1A1D190B0059AC12 /* contacts.png in Resources */,
-				B633C5A41A1D190B0059AC12 /* favourite_true_icon@2x.png in Resources */,
+				FC1F90C01A22342B004F8253 /* group_photo@2x.png in Resources */,
 				E148750518A06966002CC4F3 /* CountryCodeViewController.xib in Resources */,
 				B633C5C41A1D190B0059AC12 /* mute_on@2x.png in Resources */,
-				B633C5F41A1D190B0059AC12 /* tab_icon_inbox@2x.png in Resources */,
 				E148750618A06966002CC4F3 /* DialerViewController.xib in Resources */,
 				B633C5CE1A1D190B0059AC12 /* quit@2x.png in Resources */,
 				E148750A18A06966002CC4F3 /* InCallViewController.xib in Resources */,
-				B633C5E71A1D190B0059AC12 /* spinner_connecting.png in Resources */,
 				B633C5D01A1D190B0059AC12 /* red-delete@2x.png in Resources */,
 				B633C59D1A1D190B0059AC12 /* endcall@2x.png in Resources */,
-				B633C5C91A1D190B0059AC12 /* outgoing_call_icon.png in Resources */,
-				B633C5EA1A1D190B0059AC12 /* spinner_connecting_flash@2x.png in Resources */,
-				B633C5E31A1D190B0059AC12 /* speaker_icon_selected.png in Resources */,
-				B633C5B01A1D190B0059AC12 /* incoming_call_icon.png in Resources */,
 				B633C5CF1A1D190B0059AC12 /* received.png in Resources */,
-				B633C5AD1A1D190B0059AC12 /* in_call_phone_icon@2x.png in Resources */,
-				B633C5FA1A1D190B0059AC12 /* trash_icon@2x.png in Resources */,
-				B633C5C11A1D190B0059AC12 /* mute_icon_selected.png in Resources */,
-				B633C5AA1A1D190B0059AC12 /* icon_keypad.png in Resources */,
 				B633C5B41A1D190B0059AC12 /* keypad@2x.png in Resources */,
-				B633C5FD1A1D190B0059AC12 /* volume_low.png in Resources */,
 				B633C5DA1A1D190B0059AC12 /* settings_dark@2x.png in Resources */,
 				E14874F818A06951002CC4F3 /* ContactTableViewCell.xib in Resources */,
 				B633C5BC1A1D190B0059AC12 /* message_bubble@2x.png in Resources */,
-				B633C5EF1A1D190B0059AC12 /* tab_icon_contacts.png in Resources */,
 				B633C5D11A1D190B0059AC12 /* reply.png in Resources */,
-				B633C5EE1A1D190B0059AC12 /* spinner_ringing@2x.png in Resources */,
-				B633C6001A1D190B0059AC12 /* whisper_notification_icon@2x.png in Resources */,
+				FC15B7BF1A1F80F200F59801 /* defaultConctact_light@2x.png in Resources */,
 				E14874F918A06951002CC4F3 /* CountryCodeTableViewCell.xib in Resources */,
-				B633C5BF1A1D190B0059AC12 /* mute_icon.png in Resources */,
-				B633C5ED1A1D190B0059AC12 /* spinner_ringing.png in Resources */,
-				B633C5911A1D190B0059AC12 /* contacts_arrow@2x.png in Resources */,
 				B633C5871A1D190B0059AC12 /* call_dark@2x.png in Resources */,
-				B633C5FC1A1D190B0059AC12 /* volume_high@2x.png in Resources */,
 				B633C5BE1A1D190B0059AC12 /* missed.png in Resources */,
-				B633C5AC1A1D190B0059AC12 /* in_call_phone_icon.png in Resources */,
 				B633C5851A1D190B0059AC12 /* blue-archive@2x.png in Resources */,
-				B633C5BD1A1D190B0059AC12 /* message_icon.png in Resources */,
-				B633C5AF1A1D190B0059AC12 /* in_call_phrase_icon@2x.png in Resources */,
 				B633C5D21A1D190B0059AC12 /* savephoto@2x.png in Resources */,
-				B633C5D41A1D190B0059AC12 /* search_cancel@2x.png in Resources */,
-				B633C5A51A1D190B0059AC12 /* forward_button.png in Resources */,
-				B633C5F11A1D190B0059AC12 /* tab_icon_favourites.png in Resources */,
-				B633C5D81A1D190B0059AC12 /* send_code_icon@2x.png in Resources */,
-				B633C5CC1A1D190B0059AC12 /* phone_icon@2x.png in Resources */,
 				B633C58C1A1D190B0059AC12 /* checkmark.png in Resources */,
 				B633C5921A1D190B0059AC12 /* contacts_tab@2x.png in Resources */,
-				B633C5AE1A1D190B0059AC12 /* in_call_phrase_icon.png in Resources */,
-				B633C5D51A1D190B0059AC12 /* search_icon.png in Resources */,
-				B633C5811A1D190B0059AC12 /* archive_icon.png in Resources */,
 				B6416FB8199A0478003C5699 /* Localizable.strings in Resources */,
-				B633C5F81A1D190B0059AC12 /* tab_icon_menu@2x.png in Resources */,
-				B633C5D91A1D190B0059AC12 /* settings.png in Resources */,
-				B633C5FB1A1D190B0059AC12 /* volume_high.png in Resources */,
 				B633C5971A1D190B0059AC12 /* delete@2x.png in Resources */,
 				FCAC964119FEF99A0046DFC5 /* InboxTableViewCell.xib in Resources */,
-				B633C5E21A1D190B0059AC12 /* speaker_icon@2x.png in Resources */,
-				B633C5A91A1D190B0059AC12 /* icon_favourites.png in Resources */,
 				B66DBF4A19D5BBC8006EA940 /* Images.xcassets in Resources */,
-				B633C58B1A1D190B0059AC12 /* checkbox_empty@2x.png in Resources */,
 				70B8FEE21909FE360042E3F0 /* 171756__nenadsimic__picked-coin-echo-2.wav in Resources */,
-				B633C5881A1D190B0059AC12 /* checkbox_checkmark.png in Resources */,
-				B633C5E81A1D190B0059AC12 /* spinner_connecting@2x.png in Resources */,
-				B633C59B1A1D190B0059AC12 /* drop_down_arrow_icon.png in Resources */,
-				B633C5F71A1D190B0059AC12 /* tab_icon_menu.png in Resources */,
-				B633C5B91A1D190B0059AC12 /* menu_icon.png in Resources */,
-				B633C5E41A1D190B0059AC12 /* speaker_icon_selected@2x.png in Resources */,
 				B633C5801A1D190B0059AC12 /* archive@2x.png in Resources */,
 				E1370BEA18A0689000826894 /* AppIcon29x29.jpg in Resources */,
 				E1370BEB18A0689000826894 /* AppIcon29x29.png in Resources */,
-				B633C5E11A1D190B0059AC12 /* speaker_icon.png in Resources */,
-				B633C5A31A1D190B0059AC12 /* favourite_true_icon.png in Resources */,
 				E1370BEC18A0689000826894 /* AppIcon29x29@2x.png in Resources */,
-				B633C5991A1D190B0059AC12 /* dismiss_notification_icon.png in Resources */,
-				B633C5F61A1D190B0059AC12 /* tab_icon_keypad@2x.png in Resources */,
-				B633C5F91A1D190B0059AC12 /* trash_icon.png in Resources */,
+				FC1F90C71A223991004F8253 /* signals_tab@2x.png in Resources */,
 				E1370BED18A0689000826894 /* AppIcon40x40.png in Resources */,
 				B633C5C31A1D190B0059AC12 /* mute_off@2x.png in Resources */,
+				FC1F90C61A223991004F8253 /* settings_tab@2x.png in Resources */,
 				E1370BEE18A0689000826894 /* AppIcon40x40@2x.png in Resources */,
-				B633C5FE1A1D190B0059AC12 /* volume_low@2x.png in Resources */,
-				B633C58A1A1D190B0059AC12 /* checkbox_empty.png in Resources */,
-				B633C59C1A1D190B0059AC12 /* drop_down_arrow_icon@2x.png in Resources */,
-				B633C5E01A1D190B0059AC12 /* signals.png in Resources */,
 				E1370BEF18A0689000826894 /* AppIcon60x60.png in Resources */,
-				B633C5FF1A1D190B0059AC12 /* whisper_notification_icon.png in Resources */,
-				B633C5901A1D190B0059AC12 /* contacts_arrow.png in Resources */,
-				B633C5BA1A1D190B0059AC12 /* menu_icon@2x.png in Resources */,
 				E1370BF018A0689000826894 /* AppIcon60x60@2x.png in Resources */,
-				B633C5D71A1D190B0059AC12 /* send_code_icon.png in Resources */,
-				B633C59A1A1D190B0059AC12 /* dismiss_notification_icon@2x.png in Resources */,
-				B633C5821A1D190B0059AC12 /* archive_icon@2x.png in Resources */,
-				B633C5D31A1D190B0059AC12 /* search_cancel.png in Resources */,
 				E1370BF118A0689000826894 /* AppIcon76x76.png in Resources */,
 				E1370BF218A0689000826894 /* AppIcon76x76@2x.png in Resources */,
-				B633C5F31A1D190B0059AC12 /* tab_icon_inbox.png in Resources */,
 				B633C5B61A1D190B0059AC12 /* lock_white@2x.png in Resources */,
 				B633C5DF1A1D190B0059AC12 /* signal@2x.png in Resources */,
-				B633C5CA1A1D190B0059AC12 /* outgoing_call_icon@2x.png in Resources */,
-				B633C5A11A1D190B0059AC12 /* favourite_false_icon.png in Resources */,
-				B633C5F01A1D190B0059AC12 /* tab_icon_contacts@2x.png in Resources */,
 				B633C5831A1D190B0059AC12 /* backspace.png in Resources */,
 				E1370BE018A0686600826894 /* busy.mp3 in Resources */,
-				B633C5A01A1D190B0059AC12 /* favourite.png in Resources */,
 				E1370BE118A0686C00826894 /* completed.mp3 in Resources */,
-				B633C5EB1A1D190B0059AC12 /* spinner_error.png in Resources */,
 				E1370BE218A0686C00826894 /* failure.mp3 in Resources */,
-				B633C5C61A1D190B0059AC12 /* notification_detail_icon@2x.png in Resources */,
-				B633C5F51A1D190B0059AC12 /* tab_icon_keypad.png in Resources */,
-				B633C59F1A1D190B0059AC12 /* expanded_cell_icon@2x.png in Resources */,
-				B633C5D61A1D190B0059AC12 /* search_icon@2x.png in Resources */,
 				B633C5DB1A1D190B0059AC12 /* share@2x.png in Resources */,
 				E1370BE318A0686C00826894 /* handshake.mp3 in Resources */,
 				B633C58D1A1D190B0059AC12 /* contact_default_feed.png in Resources */,
-				B633C5C21A1D190B0059AC12 /* mute_icon_selected@2x.png in Resources */,
-				B633C5A71A1D190B0059AC12 /* home_icon.png in Resources */,
-				B633C5B11A1D190B0059AC12 /* incoming_call_icon@2x.png in Resources */,
-				B633C5B21A1D190B0059AC12 /* info@2x.png in Resources */,
-				B633C5AB1A1D190B0059AC12 /* icon_recents.png in Resources */,
 				B633C5CD1A1D190B0059AC12 /* photo@2x.png in Resources */,
-				B633C59E1A1D190B0059AC12 /* expanded_cell_icon.png in Resources */,
-				B633C5C51A1D190B0059AC12 /* notification_detail_icon.png in Resources */,
-				B633C5A81A1D190B0059AC12 /* icon_contacts.png in Resources */,
 				B633C5861A1D190B0059AC12 /* call@2x.png in Resources */,
-				B633C5C71A1D190B0059AC12 /* notification_mini_icon.png in Resources */,
 				FCAC963519FEF4E20046DFC5 /* Storyboard.storyboard in Resources */,
 				B67EBF5D19194AC60084CCFD /* Settings.bundle in Resources */,
 				E1370BE418A0686C00826894 /* outring.mp3 in Resources */,
 				B633C5841A1D190B0059AC12 /* backspace@2x.png in Resources */,
-				B633C5CB1A1D190B0059AC12 /* phone_icon.png in Resources */,
-				B633C5A21A1D190B0059AC12 /* favourite_false_icon@2x.png in Resources */,
-				B633C5EC1A1D190B0059AC12 /* spinner_error@2x.png in Resources */,
-				B633C5F21A1D190B0059AC12 /* tab_icon_favourites@2x.png in Resources */,
 				B633C5B71A1D190B0059AC12 /* logo_intro@2x.png in Resources */,
 				E1370BE518A0686C00826894 /* r.caf in Resources */,
-				B633C5C81A1D190B0059AC12 /* notification_mini_icon@2x.png in Resources */,
 				B633C5981A1D190B0059AC12 /* delete_history@2x.png in Resources */,
 				B633C5E51A1D190B0059AC12 /* speaker_off@2x.png in Resources */,
-				B633C5891A1D190B0059AC12 /* checkbox_checkmark@2x.png in Resources */,
 				B633C58F1A1D190B0059AC12 /* contacts@2x.png in Resources */,
-				B633C5C01A1D190B0059AC12 /* mute_icon@2x.png in Resources */,
 				E1370BE618A0686C00826894 /* sonarping.mp3 in Resources */,
 				B633C5961A1D190B0059AC12 /* DefaultContactImage.png in Resources */,
-				B633C5A61A1D190B0059AC12 /* forward_button@2x.png in Resources */,
 				E148751218A06AFD002CC4F3 /* HelveticaNeueLTStd-Bd.otf in Resources */,
 				E148751318A06AFD002CC4F3 /* HelveticaNeueLTStd-Th.otf in Resources */,
 				E148751418A06AFD002CC4F3 /* HelveticaNeueLTStd-Lt.otf in Resources */,
@@ -3940,7 +3604,6 @@
 				E197B61318BBEC1A00F073E5 /* DesiredBufferDepthController.m in Sources */,
 				76EB064818170B33006006FC /* Zid.m in Sources */,
 				B6B096741A1D25ED008BFAA6 /* TSMessagesManager.m in Sources */,
-				B6B096661A1D25ED008BFAA6 /* TSContact.m in Sources */,
 				76EB05E218170B33006006FC /* SecureEndPoint.m in Sources */,
 				B63AF5CC1A1F757900D01AAD /* TSRegisterWithTokenRequest.m in Sources */,
 				76EB05DE18170B33006006FC /* Certificate.m in Sources */,
@@ -4514,6 +4177,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "-fobjc-arc-exceptions";
+				PROVISIONING_PROFILE = "87a69a1c-864f-4e05-8d48-b9268ace6179";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -4565,7 +4229,7 @@
 				LLVM_LTO = NO;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_NAME = Signal;
-				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE = "87a69a1c-864f-4e05-8d48-b9268ace6179";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 1;
 				TEST_AFTER_BUILD = YES;
@@ -4684,6 +4348,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-fobjc-arc-exceptions";
+				PROVISIONING_PROFILE = "87a69a1c-864f-4e05-8d48-b9268ace6179";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -4748,6 +4413,7 @@
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-fobjc-arc-exceptions",
 				);
+				PROVISIONING_PROFILE = "87a69a1c-864f-4e05-8d48-b9268ace6179";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -4798,7 +4464,7 @@
 				LLVM_LTO = NO;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_NAME = Signal;
-				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE = "87a69a1c-864f-4e05-8d48-b9268ace6179";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 1;
 				TEST_AFTER_BUILD = YES;
@@ -4852,7 +4518,7 @@
 				LLVM_LTO = NO;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_NAME = Signal;
-				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE = "87a69a1c-864f-4e05-8d48-b9268ace6179";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 1;
 				TEST_AFTER_BUILD = YES;

Signal.xcworkspace/xcshareddata/Signal.xccheckout

@@ -5,15 +5,13 @@
 	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
 	<false/>
 	<key>IDESourceControlProjectIdentifier</key>
-	<string>90A05A58-76B3-4EF9-A59F-88109694A394</string>
+	<string>DA00CCAC-808E-4CDA-A72F-CB8431C155C0</string>
 	<key>IDESourceControlProjectName</key>
 	<string>Signal</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
 		<key>5D79A077E31B3FE97A3C6613CBFFDD71C314D14C</key>
-		<string>github.com:WhisperSystems/Signal-iOS.git</string>
-		<key>D74FB800F048CB516BB4BC70047F7CC676D291B9</key>
-		<string>https://github.com/FredericJacobs/Precompiled-Signal-Dependencies.git</string>
+		<string>https://github.com/WhisperSystems/Signal-iOS</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
 	<string>Signal.xcworkspace</string>
@@ -21,11 +19,9 @@
 	<dict>
 		<key>5D79A077E31B3FE97A3C6613CBFFDD71C314D14C</key>
 		<string>..</string>
-		<key>D74FB800F048CB516BB4BC70047F7CC676D291B9</key>
-		<string>..Pods</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
-	<string>github.com:WhisperSystems/Signal-iOS.git</string>
+	<string>https://github.com/WhisperSystems/Signal-iOS</string>
 	<key>IDESourceControlProjectVersion</key>
 	<integer>111</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>
@@ -40,14 +36,6 @@
 			<key>IDESourceControlWCCName</key>
 			<string>Signal-iOS</string>
 		</dict>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>D74FB800F048CB516BB4BC70047F7CC676D291B9</string>
-			<key>IDESourceControlWCCName</key>
-			<string>Signal-iOSPods</string>
-		</dict>
 	</array>
 </dict>
 </plist>

Signal/Images.xcassets/LaunchImage.launchimage/Contents.json

@@ -18,11 +18,12 @@
       "scale" : "3x"
     },
     {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
       "extent" : "full-screen",
-      "minimum-system-version" : "8.0",
+      "idiom" : "iphone",
       "subtype" : "667h",
+      "filename" : "Default-6.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "portrait",
       "scale" : "2x"
     },
     {

Signal/Signal-Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleIcons~ipad</key>
 	<dict/>
 	<key>CFBundleIdentifier</key>
-	<string>org.whispersystems.signal.branch</string>
+	<string>org.whispersystems.signal.textSecure</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

Signal/src/AppDelegate.m

@@ -12,6 +12,7 @@
 #import "PriorityQueue.h"
 #import "RecentCallManager.h"
 #import "Release.h"
+#import "TSStorageManager.h"
 #import "TSAccountManager.h"
 #import "Util.h"
 #import "VersionMigrations.h"
@@ -58,47 +59,6 @@
     }
 }
 
-/**
- *  Protects the preference and logs file with disk encryption and prevents them to leak to iCloud.
- */
-
-- (void)protectPreferenceFiles{
-    
-    NSMutableArray *pathsToExclude = [NSMutableArray array];
-    NSString *preferencesPath =[NSHomeDirectory() stringByAppendingString:@"/Library/Preferences/"];
-    
-    NSError *error;
-    
-    NSDictionary *attrs = @{NSFileProtectionKey: NSFileProtectionCompleteUntilFirstUserAuthentication};
-    [NSFileManager.defaultManager setAttributes:attrs ofItemAtPath:preferencesPath error:&error];
-    
-    [pathsToExclude addObject:[[preferencesPath stringByAppendingString:NSBundle.mainBundle.bundleIdentifier] stringByAppendingString:@".plist"]];
-    
-    NSString *logPath    = [NSHomeDirectory() stringByAppendingString:@"/Library/Caches/Logs/"];
-    NSArray  *logsFiles  = [NSFileManager.defaultManager contentsOfDirectoryAtPath:logPath error:&error];
-    
-    attrs = @{NSFileProtectionKey: NSFileProtectionCompleteUntilFirstUserAuthentication};
-    [NSFileManager.defaultManager setAttributes:attrs ofItemAtPath:logPath error:&error];
-    
-    for (NSString *logsFile in logsFiles) {
-        [pathsToExclude addObject:[logPath stringByAppendingString:logsFile]];
-    }
-    
-    for (NSString *pathToExclude in pathsToExclude) {
-        [[NSURL fileURLWithPath:pathToExclude] setResourceValue:@YES
-                                                             forKey:NSURLIsExcludedFromBackupKey
-                                                              error:&error];
-    }
-    
-    if (error) {
-        DDLogError(@"Error while removing log files from backup: %@", error.description);
-        UIAlertView *alert = [[UIAlertView alloc]initWithTitle:NSLocalizedString(@"WARNING", @"") message:NSLocalizedString(@"DISABLING_BACKUP_FAILED", @"") delegate:nil cancelButtonTitle:NSLocalizedString(@"OK", @"") otherButtonTitles:nil, nil];
-        [alert show];
-        return;
-    }
-    
-}
-
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     
     BOOL loggingIsEnabled;
@@ -121,8 +81,9 @@
         [DebugLogger.sharedInstance enableFileLogging];
     }
     
+    [[TSStorageManager sharedManager] setupDatabase];
+    
     [self performUpdateCheck];
-    [self protectPreferenceFiles];
     
     //self.window = [[UIWindow alloc] initWithFrame:UIScreen.mainScreen.bounds];
     
@@ -144,6 +105,21 @@
         [self application:application didReceiveRemoteNotification:remoteNotif];
     }
     
+    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Storyboard" bundle:[NSBundle mainBundle]];
+    
+    UIViewController *viewController;
+    
+    if (![TSAccountManager isRegistered]) {
+        viewController = [storyboard instantiateViewControllerWithIdentifier:@"RegisterInitialViewController"];
+    } else{
+        viewController = [storyboard instantiateViewControllerWithIdentifier:@"UserInitialViewController"];
+    }
+    
+    self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+    self.window.rootViewController = viewController;
+    
+    [self.window makeKeyAndVisible];
+    
     [Environment.phoneManager.currentCallObservable watchLatestValue:^(CallState* latestCall) {
         if (latestCall == nil){
             return;
@@ -166,15 +142,6 @@
         [self.window.rootViewController presentViewController:callViewController animated:NO completion:nil];
     } onThread:NSThread.mainThread untilCancelled:nil];
     
-    UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Storyboard" bundle:[NSBundle mainBundle]];
-    
-    UIViewController *viewController;
-    
-    BOOL isNewUser = NO;
-    
-    self.window.rootViewController = isNewUser ? viewControllerForNewUser : viewController;
-    [self.window makeKeyAndVisible];
-    
     return YES;
 }
 

Signal/src/Storyboard/Storyboard.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14A388a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="kts-vO-ui1">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14C68k" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="kts-vO-ui1">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
         <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
@@ -24,7 +24,7 @@
                                 <color key="separatorColor" white="0.66666666666666663" alpha="0.5" colorSpace="calibratedWhite"/>
                                 <inset key="separatorInset" minX="20" minY="0.0" maxX="0.0" maxY="0.0"/>
                                 <prototypes>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="bnD-Ld-pC4">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="showCell" id="bnD-Ld-pC4">
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bnD-Ld-pC4" id="9EM-iT-Acg">
                                             <autoresizingMask key="autoresizingMask"/>
@@ -120,7 +120,7 @@
                     </view>
                     <connections>
                         <segue destination="m2q-RS-sTo" kind="presentation" identifier="fullImage" id="vI3-mk-n1C"/>
-                        <segue destination="urv-62-RsD" kind="presentation" identifier="fingerprintSegue" modalPresentationStyle="overCurrentContext" id="Zjl-QX-tHE"/>
+                        <segue destination="urv-62-RsD" kind="presentation" identifier="fingerprintSegue" modalPresentationStyle="overCurrentContext" animates="NO" id="Zjl-QX-tHE"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="yXZ-iE-5va" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -480,12 +480,14 @@ Lorem ipsum : Quick explanation of Fingerprints</string>
                         <constraints>
                             <constraint firstItem="hdo-6G-gXy" firstAttribute="top" secondItem="VCu-vN-Pjg" secondAttribute="bottom" id="1dB-W2-GMz"/>
                             <constraint firstAttribute="centerX" secondItem="VCu-vN-Pjg" secondAttribute="centerX" id="5Wt-QM-aQa"/>
-                            <constraint firstAttribute="trailingMargin" secondItem="VCu-vN-Pjg" secondAttribute="trailing" constant="-16" id="7HF-IV-JbS"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="VCu-vN-Pjg" secondAttribute="trailing" constant="-16" id="7HF-IV-JbS">
+                                <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
+                            </constraint>
                             <constraint firstItem="VCu-vN-Pjg" firstAttribute="top" secondItem="8Oc-YZ-y0M" secondAttribute="bottom" constant="-20" id="KIN-pk-9pP"/>
                             <constraint firstAttribute="width" secondItem="VCu-vN-Pjg" secondAttribute="width" id="gOw-BF-mQC"/>
                             <constraint firstAttribute="height" secondItem="VCu-vN-Pjg" secondAttribute="height" id="nEQ-Wa-OyH"/>
                             <constraint firstAttribute="centerY" secondItem="VCu-vN-Pjg" secondAttribute="centerY" id="sho-vB-Yk8"/>
-                            <constraint firstItem="VCu-vN-Pjg" firstAttribute="leading" secondItem="StY-nr-mRe" secondAttribute="leadingMargin" constant="-16" id="wdN-bv-bSl"/>
+                            <constraint firstItem="VCu-vN-Pjg" firstAttribute="leading" secondItem="StY-nr-mRe" secondAttribute="leadingMargin" id="wdN-bv-bSl"/>
                         </constraints>
                         <variation key="default">
                             <mask key="subviews">
@@ -509,12 +511,12 @@ Lorem ipsum : Quick explanation of Fingerprints</string>
                             <mask key="constraints">
                                 <include reference="1dB-W2-GMz"/>
                                 <include reference="5Wt-QM-aQa"/>
-                                <include reference="7HF-IV-JbS"/>
+                                <exclude reference="7HF-IV-JbS"/>
                                 <include reference="KIN-pk-9pP"/>
                                 <include reference="gOw-BF-mQC"/>
                                 <include reference="nEQ-Wa-OyH"/>
                                 <include reference="sho-vB-Yk8"/>
-                                <include reference="wdN-bv-bSl"/>
+                                <exclude reference="wdN-bv-bSl"/>
                             </mask>
                         </variation>
                     </view>
@@ -696,10 +698,16 @@ Lorem ipsum : Quick explanation of Fingerprints</string>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstItem="Mof-iB-rK4" firstAttribute="leading" secondItem="sqD-R1-bDb" secondAttribute="leadingMargin" constant="133" id="2LP-n6-sju"/>
+                            <constraint firstItem="Mof-iB-rK4" firstAttribute="leading" secondItem="sqD-R1-bDb" secondAttribute="leadingMargin" constant="133" id="2LP-n6-sju">
+                                <variation key="heightClass=regular-widthClass=compact" constant="120"/>
+                            </constraint>
                             <constraint firstItem="XvA-gQ-BvT" firstAttribute="top" secondItem="pSv-Dm-f1R" secondAttribute="bottom" constant="33" id="6nH-Or-yM8"/>
-                            <constraint firstAttribute="trailingMargin" secondItem="Mof-iB-rK4" secondAttribute="trailing" constant="111" id="7iK-MA-IkY"/>
-                            <constraint firstAttribute="centerX" secondItem="Mof-iB-rK4" secondAttribute="centerX" constant="-11" id="7pm-Ag-hz5"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="Mof-iB-rK4" secondAttribute="trailing" constant="111" id="7iK-MA-IkY">
+                                <variation key="heightClass=regular-widthClass=compact" constant="120"/>
+                            </constraint>
+                            <constraint firstAttribute="centerX" secondItem="Mof-iB-rK4" secondAttribute="centerX" constant="-11" id="7pm-Ag-hz5">
+                                <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
+                            </constraint>
                             <constraint firstItem="XvA-gQ-BvT" firstAttribute="leading" secondItem="8e0-BB-J7K" secondAttribute="trailing" constant="24" id="Awz-px-K0y"/>
                             <constraint firstItem="f2V-td-jYH" firstAttribute="top" secondItem="8e0-BB-J7K" secondAttribute="bottom" constant="36" id="GVY-Zq-Uwd"/>
                             <constraint firstItem="91B-iw-6Q2" firstAttribute="top" secondItem="Mof-iB-rK4" secondAttribute="bottom" constant="8" id="JXZ-Xt-34m"/>
@@ -1523,7 +1531,9 @@ Lorem ipsum : Quick explanation of Fingerprints</string>
                                     </subviews>
                                     <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
                                     <constraints>
-                                        <constraint firstItem="tO8-Ws-fM1" firstAttribute="top" secondItem="wU0-a0-5eX" secondAttribute="topMargin" id="3MK-mI-oOl"/>
+                                        <constraint firstItem="tO8-Ws-fM1" firstAttribute="top" secondItem="wU0-a0-5eX" secondAttribute="topMargin" id="3MK-mI-oOl">
+                                            <variation key="heightClass=regular-widthClass=compact" constant="8"/>
+                                        </constraint>
                                         <constraint firstItem="bNN-KQ-y5B" firstAttribute="top" secondItem="tO8-Ws-fM1" secondAttribute="bottom" constant="8" id="Tbx-o9-F7q"/>
                                         <constraint firstAttribute="centerX" secondItem="tO8-Ws-fM1" secondAttribute="centerX" id="arL-FC-hxm"/>
                                         <constraint firstAttribute="trailingMargin" secondItem="bNN-KQ-y5B" secondAttribute="trailing" constant="42" id="ee0-9M-0xY"/>
@@ -1599,6 +1609,9 @@ Lorem ipsum : Quick explanation of Fingerprints</string>
                                                     <include reference="TCV-4b-mLz"/>
                                                 </mask>
                                             </variation>
+                                            <connections>
+                                                <action selector="messageButtonTapped:" destination="Oss-Ve-Ae2" eventType="touchUpInside" id="xUe-ws-ORM"/>
+                                            </connections>
                                         </button>
                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yd5-y1-zqu">
                                             <rect key="frame" x="-23" y="-15" width="46" height="30"/>
@@ -1621,6 +1634,9 @@ Lorem ipsum : Quick explanation of Fingerprints</string>
                                                     <include reference="r9U-7K-XEr"/>
                                                 </mask>
                                             </variation>
+                                            <connections>
+                                                <action selector="callButtonTapped:" destination="Oss-Ve-Ae2" eventType="touchUpInside" id="1qD-m1-bQk"/>
+                                            </connections>
                                         </button>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Message" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Njs-kS-m25">
                                             <rect key="frame" x="0.0" y="-21" width="42" height="21"/>
@@ -1748,25 +1764,25 @@ Lorem ipsum : Quick explanation of Fingerprints</string>
                                             <exclude reference="jiU-kH-HN5"/>
                                         </mask>
                                         <mask key="constraints">
-                                            <exclude reference="5uk-1r-gO8"/>
-                                            <exclude reference="d2p-aN-BLp"/>
-                                            <exclude reference="oW3-SC-n5d"/>
+                                            <exclude reference="CzT-yE-ZZi"/>
+                                            <exclude reference="flS-Xw-75h"/>
+                                            <exclude reference="jGu-1E-j8M"/>
+                                            <exclude reference="jyc-n8-PKc"/>
                                             <exclude reference="VZj-eb-IRz"/>
                                             <exclude reference="lsu-rO-VMN"/>
-                                            <exclude reference="H6U-fc-9b2"/>
-                                            <exclude reference="R2z-Rq-wQr"/>
-                                            <exclude reference="gq2-cU-hxB"/>
                                             <exclude reference="C9w-qG-yIC"/>
                                             <exclude reference="KD5-FZ-hIh"/>
                                             <exclude reference="toZ-zh-Iy3"/>
                                             <exclude reference="uMB-bd-99x"/>
-                                            <exclude reference="CzT-yE-ZZi"/>
-                                            <exclude reference="flS-Xw-75h"/>
-                                            <exclude reference="jGu-1E-j8M"/>
-                                            <exclude reference="jyc-n8-PKc"/>
+                                            <exclude reference="5uk-1r-gO8"/>
+                                            <exclude reference="d2p-aN-BLp"/>
+                                            <exclude reference="oW3-SC-n5d"/>
                                             <exclude reference="Dfd-BI-EVU"/>
                                             <exclude reference="EbC-OA-toO"/>
                                             <exclude reference="roy-5R-k37"/>
+                                            <exclude reference="H6U-fc-9b2"/>
+                                            <exclude reference="R2z-Rq-wQr"/>
+                                            <exclude reference="gq2-cU-hxB"/>
                                         </mask>
                                     </variation>
                                     <variation key="heightClass=regular-widthClass=compact">
@@ -1779,31 +1795,31 @@ Lorem ipsum : Quick explanation of Fingerprints</string>
                                             <include reference="jiU-kH-HN5"/>
                                         </mask>
                                         <mask key="constraints">
-                                            <include reference="5uk-1r-gO8"/>
-                                            <include reference="d2p-aN-BLp"/>
-                                            <include reference="oW3-SC-n5d"/>
+                                            <include reference="CzT-yE-ZZi"/>
+                                            <exclude reference="flS-Xw-75h"/>
+                                            <include reference="jGu-1E-j8M"/>
+                                            <include reference="jyc-n8-PKc"/>
                                             <include reference="VZj-eb-IRz"/>
                                             <include reference="lsu-rO-VMN"/>
-                                            <exclude reference="H6U-fc-9b2"/>
-                                            <include reference="R2z-Rq-wQr"/>
-                                            <include reference="gq2-cU-hxB"/>
                                             <include reference="C9w-qG-yIC"/>
                                             <exclude reference="KD5-FZ-hIh"/>
                                             <include reference="toZ-zh-Iy3"/>
                                             <include reference="uMB-bd-99x"/>
-                                            <include reference="CzT-yE-ZZi"/>
-                                            <exclude reference="flS-Xw-75h"/>
-                                            <include reference="jGu-1E-j8M"/>
-                                            <include reference="jyc-n8-PKc"/>
+                                            <include reference="5uk-1r-gO8"/>
+                                            <include reference="d2p-aN-BLp"/>
+                                            <include reference="oW3-SC-n5d"/>
                                             <include reference="Dfd-BI-EVU"/>
                                             <include reference="EbC-OA-toO"/>
                                             <exclude reference="roy-5R-k37"/>
+                                            <exclude reference="H6U-fc-9b2"/>
+                                            <include reference="R2z-Rq-wQr"/>
+                                            <include reference="gq2-cU-hxB"/>
                                         </mask>
                                     </variation>
                                 </tableViewCellContentView>
                                 <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                             </tableViewCell>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ShareCell" rowHeight="60" id="hSC-7F-dj5" customClass="ContactDetailCell">
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ShareCell" rowHeight="60" id="hSC-7F-dj5" customClass="ContactDetailCell">
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hSC-7F-dj5" id="lvR-BE-4Mx">
                                     <autoresizingMask key="autoresizingMask"/>
@@ -1883,7 +1899,7 @@ Lorem ipsum : Quick explanation of Fingerprints</string>
                                 </tableViewCellContentView>
                                 <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                             </tableViewCell>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="EmailCell" rowHeight="60" id="fWm-EM-av7" customClass="ContactDetailCell">
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="EmailCell" rowHeight="60" id="fWm-EM-av7" customClass="ContactDetailCell">
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fWm-EM-av7" id="yVD-4a-A9L">
                                     <autoresizingMask key="autoresizingMask"/>
@@ -1921,8 +1937,11 @@ Lorem ipsum : Quick explanation of Fingerprints</string>
                                     </variation>
                                 </tableViewCellContentView>
                                 <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                                <connections>
+                                    <outlet property="contactEmailLabel" destination="wyP-HL-Ljs" id="XuV-Uf-aw4"/>
+                                </connections>
                             </tableViewCell>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AnnexPhoneNumberCell" rowHeight="60" id="gGz-wn-6Ah" customClass="ContactDetailCell">
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="AnnexPhoneNumberCell" rowHeight="60" id="gGz-wn-6Ah" customClass="ContactDetailCell">
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gGz-wn-6Ah" id="GZI-HN-czN">
                                     <autoresizingMask key="autoresizingMask"/>
@@ -1960,6 +1979,9 @@ Lorem ipsum : Quick explanation of Fingerprints</string>
                                     </variation>
                                 </tableViewCellContentView>
                                 <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                                <connections>
+                                    <outlet property="contactAnnexNumberLabel" destination="kD5-iI-vzc" id="LnK-Hn-Bfa"/>
+                                </connections>
                             </tableViewCell>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="NotesCell" rowHeight="165" id="hWy-FH-ik2" customClass="ContactDetailCell">
                                 <autoresizingMask key="autoresizingMask"/>
@@ -2221,7 +2243,7 @@ Lorem ipsum : Quick explanation of Fingerprints</string>
         <scene sceneID="miN-Ma-3eR">
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="tuk-0x-yCb" customClass="SignalsNavigationController" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="" image="signals.png" id="jye-1e-hLH">
+                    <tabBarItem key="tabBarItem" title="" image="signals_tab.png" id="jye-1e-hLH">
                         <inset key="imageInsets" minX="0.0" minY="4" maxX="0.0" maxY="-4"/>
                     </tabBarItem>
                     <toolbarItems/>
@@ -2266,7 +2288,7 @@ Lorem ipsum : Quick explanation of Fingerprints</string>
         <scene sceneID="8zg-9i-Ja1">
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="hxR-Pc-Gxm" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" image="settings.png" id="39n-tG-6SH">
+                    <tabBarItem key="tabBarItem" image="settings_tab.png" id="39n-tG-6SH">
                         <inset key="imageInsets" minX="0.0" minY="4" maxX="0.0" maxY="-4"/>
                     </tabBarItem>
                     <toolbarItems/>
@@ -2297,11 +2319,24 @@ Lorem ipsum : Quick explanation of Fingerprints</string>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yD5-2a-WDn">
                                     <rect key="frame" x="0.0" y="-21" width="42" height="21"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="40" id="kAN-p0-AiW"/>
+                                    </constraints>
                                     <string key="text">Copyright ©OpenWhisperSystems
 Licensed under the GPLv3</string>
                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                     <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                     <nil key="highlightedColor"/>
+                                    <variation key="default">
+                                        <mask key="constraints">
+                                            <exclude reference="kAN-p0-AiW"/>
+                                        </mask>
+                                    </variation>
+                                    <variation key="heightClass=regular-widthClass=compact">
+                                        <mask key="constraints">
+                                            <include reference="kAN-p0-AiW"/>
+                                        </mask>
+                                    </variation>
                                 </label>
                             </subviews>
                             <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
@@ -2329,7 +2364,7 @@ Licensed under the GPLv3</string>
                                 <mask key="constraints">
                                     <include reference="Gib-h9-eVO"/>
                                     <include reference="Jdi-o3-pGy"/>
-                                    <include reference="NRH-81-JZa"/>
+                                    <exclude reference="NRH-81-JZa"/>
                                     <include reference="SP2-Vt-nmY"/>
                                 </mask>
                             </variation>
@@ -2337,17 +2372,11 @@ Licensed under the GPLv3</string>
                         <sections>
                             <tableViewSection id="2XP-ps-mfi">
                                 <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="180" id="5zF-Ko-9qU" customClass="SettingsTableViewCell">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="87" id="5zF-Ko-9qU" customClass="SettingsTableViewCell">
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5zF-Ko-9qU" id="gr7-Sm-bcs">
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="+41 70 980 28 19" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ipE-BI-sLL">
-                                                    <rect key="frame" x="0.0" y="-21" width="42" height="21"/>
-                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="17"/>
-                                                    <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Dylan Bourgeois" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Pu-Cs-0K2">
                                                     <rect key="frame" x="0.0" y="-21" width="42" height="21"/>
                                                     <constraints>
@@ -2367,47 +2396,19 @@ Licensed under the GPLv3</string>
                                                         </mask>
                                                     </variation>
                                                 </label>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="DefaultContactImage.png" translatesAutoresizingMaskIntoConstraints="NO" id="7CR-b7-00a">
-                                                    <rect key="frame" x="0.0" y="0.0" width="240" height="128"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" constant="75" id="j7R-ZB-avk">
-                                                            <variation key="heightClass=regular-widthClass=compact" constant="100"/>
-                                                        </constraint>
-                                                        <constraint firstAttribute="height" constant="75" id="pEC-yk-Xri">
-                                                            <variation key="heightClass=regular-widthClass=compact" constant="100"/>
-                                                        </constraint>
-                                                    </constraints>
-                                                    <variation key="default">
-                                                        <mask key="constraints">
-                                                            <exclude reference="j7R-ZB-avk"/>
-                                                            <exclude reference="pEC-yk-Xri"/>
-                                                        </mask>
-                                                    </variation>
-                                                    <variation key="heightClass=regular-widthClass=compact">
-                                                        <mask key="constraints">
-                                                            <include reference="j7R-ZB-avk"/>
-                                                            <include reference="pEC-yk-Xri"/>
-                                                        </mask>
-                                                    </variation>
-                                                </imageView>
-                                                <button hidden="YES" opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RHr-0a-s3d">
-                                                    <rect key="frame" x="-23" y="-15" width="46" height="30"/>
-                                                    <state key="normal" image="photo.png">
-                                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                                    </state>
-                                                </button>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="+41 70 980 28 19" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ipE-BI-sLL">
+                                                    <rect key="frame" x="0.0" y="-21" width="42" height="21"/>
+                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="17"/>
+                                                    <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
                                             </subviews>
                                             <constraints>
                                                 <constraint firstItem="3Pu-Cs-0K2" firstAttribute="trailing" secondItem="gr7-Sm-bcs" secondAttribute="trailingMargin" id="4cA-kW-n9A">
                                                     <variation key="heightClass=regular-widthClass=compact" constant="-50"/>
                                                 </constraint>
                                                 <constraint firstItem="3Pu-Cs-0K2" firstAttribute="top" secondItem="gr7-Sm-bcs" secondAttribute="topMargin" constant="14" id="5bY-hD-EYS">
-                                                    <variation key="heightClass=regular-widthClass=compact" constant="108"/>
-                                                </constraint>
-                                                <constraint firstAttribute="centerX" secondItem="7CR-b7-00a" secondAttribute="centerX" id="NBK-Mf-MTg"/>
-                                                <constraint firstItem="7CR-b7-00a" firstAttribute="width" secondItem="RHr-0a-s3d" secondAttribute="width" id="R9V-av-5jf"/>
-                                                <constraint firstItem="7CR-b7-00a" firstAttribute="top" secondItem="gr7-Sm-bcs" secondAttribute="topMargin" constant="4" id="RFM-q7-ucC">
-                                                    <variation key="heightClass=regular-widthClass=compact" constant="0.0"/>
+                                                    <variation key="heightClass=regular-widthClass=compact" constant="12"/>
                                                 </constraint>
                                                 <constraint firstItem="ipE-BI-sLL" firstAttribute="leading" secondItem="gr7-Sm-bcs" secondAttribute="leadingMargin" constant="99" id="c5a-HY-X68">
                                                     <variation key="heightClass=regular-widthClass=compact" constant="50"/>
@@ -2418,22 +2419,14 @@ Licensed under the GPLv3</string>
                                                 <constraint firstItem="3Pu-Cs-0K2" firstAttribute="leading" secondItem="gr7-Sm-bcs" secondAttribute="leadingMargin" constant="99" id="gVJ-kJ-ilB">
                                                     <variation key="heightClass=regular-widthClass=compact" constant="50"/>
                                                 </constraint>
-                                                <constraint firstItem="7CR-b7-00a" firstAttribute="centerY" secondItem="RHr-0a-s3d" secondAttribute="centerY" id="kis-C3-eWd"/>
                                                 <constraint firstAttribute="bottomMargin" secondItem="ipE-BI-sLL" secondAttribute="bottom" constant="11.5" id="nIo-TW-c0a">
-                                                    <variation key="heightClass=regular-widthClass=compact" constant="7.5"/>
-                                                </constraint>
-                                                <constraint firstItem="7CR-b7-00a" firstAttribute="leading" secondItem="gr7-Sm-bcs" secondAttribute="leadingMargin" id="oNo-wq-biP">
-                                                    <variation key="heightClass=regular-widthClass=compact" constant="142"/>
+                                                    <variation key="heightClass=regular-widthClass=compact" constant="12"/>
                                                 </constraint>
-                                                <constraint firstItem="7CR-b7-00a" firstAttribute="centerX" secondItem="RHr-0a-s3d" secondAttribute="centerX" id="pmi-gE-xSY"/>
-                                                <constraint firstItem="7CR-b7-00a" firstAttribute="height" secondItem="RHr-0a-s3d" secondAttribute="height" id="xnt-2P-MDu"/>
                                             </constraints>
                                             <variation key="default">
                                                 <mask key="subviews">
-                                                    <exclude reference="ipE-BI-sLL"/>
                                                     <exclude reference="3Pu-Cs-0K2"/>
-                                                    <exclude reference="7CR-b7-00a"/>
-                                                    <exclude reference="RHr-0a-s3d"/>
+                                                    <exclude reference="ipE-BI-sLL"/>
                                                 </mask>
                                                 <mask key="constraints">
                                                     <exclude reference="4cA-kW-n9A"/>
@@ -2442,21 +2435,12 @@ Licensed under the GPLv3</string>
                                                     <exclude reference="c5a-HY-X68"/>
                                                     <exclude reference="cU4-H3-udB"/>
                                                     <exclude reference="nIo-TW-c0a"/>
-                                                    <exclude reference="NBK-Mf-MTg"/>
-                                                    <exclude reference="R9V-av-5jf"/>
-                                                    <exclude reference="RFM-q7-ucC"/>
-                                                    <exclude reference="kis-C3-eWd"/>
-                                                    <exclude reference="oNo-wq-biP"/>
-                                                    <exclude reference="pmi-gE-xSY"/>
-                                                    <exclude reference="xnt-2P-MDu"/>
                                                 </mask>
                                             </variation>
                                             <variation key="heightClass=regular-widthClass=compact">
                                                 <mask key="subviews">
-                                                    <include reference="ipE-BI-sLL"/>
                                                     <include reference="3Pu-Cs-0K2"/>
-                                                    <include reference="7CR-b7-00a"/>
-                                                    <include reference="RHr-0a-s3d"/>
+                                                    <include reference="ipE-BI-sLL"/>
                                                 </mask>
                                                 <mask key="constraints">
                                                     <include reference="4cA-kW-n9A"/>
@@ -2465,21 +2449,11 @@ Licensed under the GPLv3</string>
                                                     <include reference="c5a-HY-X68"/>
                                                     <include reference="cU4-H3-udB"/>
                                                     <include reference="nIo-TW-c0a"/>
-                                                    <include reference="NBK-Mf-MTg"/>
-                                                    <include reference="R9V-av-5jf"/>
-                                                    <include reference="RFM-q7-ucC"/>
-                                                    <include reference="kis-C3-eWd"/>
-                                                    <exclude reference="oNo-wq-biP"/>
-                                                    <include reference="pmi-gE-xSY"/>
-                                                    <include reference="xnt-2P-MDu"/>
                                                 </mask>
                                             </variation>
                                         </tableViewCellContentView>
                                         <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
                                         <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
-                                        <connections>
-                                            <outlet property="profileImageView" destination="7CR-b7-00a" id="RgF-8e-3gl"/>
-                                        </connections>
                                     </tableViewCell>
                                 </cells>
                             </tableViewSection>
@@ -2835,7 +2809,7 @@ Licensed under the GPLv3</string>
                                             </variation>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" rowHeight="60" id="qa9-qm-gch">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" rowHeight="60" id="qa9-qm-gch">
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="qa9-qm-gch" id="TLw-od-YLh">
                                             <autoresizingMask key="autoresizingMask"/>
@@ -2982,7 +2956,7 @@ Licensed under the GPLv3</string>
                                             </variation>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" rowHeight="60" id="EsY-xH-b6d">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" rowHeight="60" id="EsY-xH-b6d">
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="EsY-xH-b6d" id="b4g-jW-QGg">
                                             <autoresizingMask key="autoresizingMask"/>
@@ -3078,14 +3052,6 @@ Licensed under the GPLv3</string>
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                        <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="7mq-NT-L2U">
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7mq-NT-L2U" id="KsQ-3g-29V">
-                                    <autoresizingMask key="autoresizingMask"/>
-                                </tableViewCellContentView>
-                            </tableViewCell>
-                        </prototypes>
                         <connections>
                             <outlet property="dataSource" destination="Qga-41-bw2" id="dUq-5d-dub"/>
                             <outlet property="delegate" destination="Qga-41-bw2" id="vfF-Gh-noL"/>
@@ -3124,13 +3090,35 @@ Licensed under the GPLv3</string>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ukg-om-VX3">
                                 <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                                 <subviews>
+                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Name this group chat" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="gbm-B5-gCc">
+                                        <rect key="frame" x="0.0" y="-30" width="97" height="30"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="30" id="bKM-dc-IsP"/>
+                                        </constraints>
+                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences" returnKeyType="done" enablesReturnKeyAutomatically="YES"/>
+                                        <variation key="default">
+                                            <mask key="constraints">
+                                                <exclude reference="bKM-dc-IsP"/>
+                                            </mask>
+                                        </variation>
+                                        <variation key="heightClass=regular-widthClass=compact">
+                                            <mask key="constraints">
+                                                <include reference="bKM-dc-IsP"/>
+                                            </mask>
+                                        </variation>
+                                    </textField>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ul8-NY-i4c">
                                         <rect key="frame" x="-23" y="-15" width="46" height="30"/>
                                         <constraints>
-                                            <constraint firstAttribute="height" constant="80" id="Fkg-iq-6Ap"/>
-                                            <constraint firstAttribute="width" constant="80" id="l0W-ug-b1c"/>
+                                            <constraint firstAttribute="height" constant="80" id="Fkg-iq-6Ap">
+                                                <variation key="heightClass=regular-widthClass=compact" constant="60"/>
+                                            </constraint>
+                                            <constraint firstAttribute="width" constant="80" id="l0W-ug-b1c">
+                                                <variation key="heightClass=regular-widthClass=compact" constant="60"/>
+                                            </constraint>
                                         </constraints>
-                                        <state key="normal" image="photo.png">
+                                        <state key="normal" image="group_photo.png">
                                             <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                         </state>
                                         <variation key="default">
@@ -3149,24 +3137,6 @@ Licensed under the GPLv3</string>
                                             <action selector="addGroupPhoto:" destination="bDi-2Q-XOC" eventType="touchUpInside" id="S3n-hS-Ac6"/>
                                         </connections>
                                     </button>
-                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Name this group chat" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="gbm-B5-gCc">
-                                        <rect key="frame" x="0.0" y="-30" width="97" height="30"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="30" id="bKM-dc-IsP"/>
-                                        </constraints>
-                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences" returnKeyType="done" enablesReturnKeyAutomatically="YES"/>
-                                        <variation key="default">
-                                            <mask key="constraints">
-                                                <exclude reference="bKM-dc-IsP"/>
-                                            </mask>
-                                        </variation>
-                                        <variation key="heightClass=regular-widthClass=compact">
-                                            <mask key="constraints">
-                                                <include reference="bKM-dc-IsP"/>
-                                            </mask>
-                                        </variation>
-                                    </textField>
                                 </subviews>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
@@ -3174,13 +3144,17 @@ Licensed under the GPLv3</string>
                                     <constraint firstItem="gbm-B5-gCc" firstAttribute="top" secondItem="Ukg-om-VX3" secondAttribute="top" constant="35" id="3Zi-yw-cGM"/>
                                     <constraint firstAttribute="height" constant="100" id="GmE-Dd-5tf"/>
                                     <constraint firstItem="Ul8-NY-i4c" firstAttribute="leading" secondItem="Ukg-om-VX3" secondAttribute="leading" constant="8" id="Z82-gx-rVW"/>
-                                    <constraint firstItem="Ul8-NY-i4c" firstAttribute="top" secondItem="Ukg-om-VX3" secondAttribute="top" constant="10" id="ZIm-Uq-bM8"/>
-                                    <constraint firstItem="gbm-B5-gCc" firstAttribute="leading" secondItem="Ul8-NY-i4c" secondAttribute="trailing" constant="8" id="yn3-rt-mGC"/>
+                                    <constraint firstItem="Ul8-NY-i4c" firstAttribute="top" secondItem="Ukg-om-VX3" secondAttribute="top" constant="10" id="ZIm-Uq-bM8">
+                                        <variation key="heightClass=regular-widthClass=compact" constant="20"/>
+                                    </constraint>
+                                    <constraint firstItem="gbm-B5-gCc" firstAttribute="leading" secondItem="Ul8-NY-i4c" secondAttribute="trailing" constant="8" id="yn3-rt-mGC">
+                                        <variation key="heightClass=regular-widthClass=compact" constant="18"/>
+                                    </constraint>
                                 </constraints>
                                 <variation key="default">
                                     <mask key="subviews">
-                                        <exclude reference="Ul8-NY-i4c"/>
                                         <exclude reference="gbm-B5-gCc"/>
+                                        <exclude reference="Ul8-NY-i4c"/>
                                     </mask>
                                     <mask key="constraints">
                                         <exclude reference="GmE-Dd-5tf"/>
@@ -3193,8 +3167,8 @@ Licensed under the GPLv3</string>
                                 </variation>
                                 <variation key="heightClass=regular-widthClass=compact">
                                     <mask key="subviews">
-                                        <include reference="Ul8-NY-i4c"/>
                                         <include reference="gbm-B5-gCc"/>
+                                        <include reference="Ul8-NY-i4c"/>
                                     </mask>
                                     <mask key="constraints">
                                         <include reference="GmE-Dd-5tf"/>
@@ -3227,7 +3201,7 @@ Licensed under the GPLv3</string>
                                             </subviews>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="GroupSearchCell" textLabel="a4j-OQ-ala" style="IBUITableViewCellStyleDefault" id="yfF-Jl-bZ1">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="gray" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="GroupSearchCell" textLabel="a4j-OQ-ala" style="IBUITableViewCellStyleDefault" id="yfF-Jl-bZ1">
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yfF-Jl-bZ1" id="f0v-od-N9K">
                                             <autoresizingMask key="autoresizingMask"/>
@@ -3315,17 +3289,17 @@ Licensed under the GPLv3</string>
         <image name="call_dark.png" width="50" height="50"/>
         <image name="contacts_tab.png" width="24" height="24"/>
         <image name="delete_history.png" width="50" height="50"/>
+        <image name="group_photo.png" width="100" height="100"/>
         <image name="keypad.png" width="25" height="25"/>
         <image name="lock_white.png" width="100" height="100"/>
         <image name="logo_intro.png" width="291" height="255"/>
-        <image name="photo.png" width="200" height="200"/>
         <image name="quit.png" width="50" height="50"/>
         <image name="savephoto.png" width="50" height="50"/>
-        <image name="settings.png" width="24" height="24"/>
+        <image name="settings_tab.png" width="24" height="24"/>
         <image name="share.png" width="50" height="50"/>
         <image name="shred.png" width="200" height="200"/>
         <image name="signal.png" width="50" height="50"/>
-        <image name="signals.png" width="24" height="24"/>
+        <image name="signals_tab.png" width="24" height="24"/>
     </resources>
     <inferredMetricsTieBreakers>
         <segue reference="QK8-XK-Wd3"/>