diff --git a/Classes/Base.lproj/ChatConversationCreateView.xib b/Classes/Base.lproj/ChatConversationCreateView.xib
index 2b6129977..5a5bb9edf 100644
--- a/Classes/Base.lproj/ChatConversationCreateView.xib
+++ b/Classes/Base.lproj/ChatConversationCreateView.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -13,10 +13,14 @@
             <connections>
                 <outlet property="allButton" destination="r3z-SM-lMq" id="DUC-gQ-gKu"/>
                 <outlet property="backButton" destination="fNt-yb-wsf" id="3Xj-Dv-LmO"/>
+                <outlet property="chiffreButton" destination="uUN-bl-g4c" id="w8f-8e-vBx"/>
+                <outlet property="chiffreImage" destination="jIQ-qM-GVG" id="mSL-Kf-21s"/>
+                <outlet property="chiffreOptionView" destination="9gK-1a-7Hl" id="gXA-hF-uGd"/>
                 <outlet property="collectionView" destination="KRQ-Fm-3cQ" id="otM-cN-lEg"/>
                 <outlet property="linphoneButton" destination="8lQ-fv-INK" id="zaP-UT-K4y"/>
                 <outlet property="nextButton" destination="rBc-dQ-eIj" id="QHB-Xp-PTA"/>
                 <outlet property="selectedButtonImage" destination="ibu-Ra-oZO" id="jvl-ay-cfh"/>
+                <outlet property="switchView" destination="d5Q-XR-FNz" id="Xeo-ZG-6cr"/>
                 <outlet property="tableController" destination="4" id="18"/>
                 <outlet property="view" destination="5" id="14"/>
                 <outlet property="waitView" destination="Ztm-hK-aBp" id="qYh-M5-heN"/>
@@ -40,7 +44,7 @@
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                 </imageView>
                                 <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="d5Q-XR-FNz" userLabel="switchView">
-                                    <rect key="frame" x="112" y="0.0" width="150" height="66"/>
+                                    <rect key="frame" x="225" y="0.0" width="150" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                     <subviews>
                                         <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="r3z-SM-lMq" userLabel="allButton" customClass="UIIconButton">
@@ -102,6 +106,42 @@
                                         <action selector="onBackClick:" destination="-1" eventType="touchUpInside" id="463-Qr-hJG"/>
                                     </connections>
                                 </button>
+                                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9gK-1a-7Hl" userLabel="chiffreOptionView">
+                                    <rect key="frame" x="72" y="0.0" width="150" height="66"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    <subviews>
+                                        <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4Be-pr-fmB">
+                                            <rect key="frame" x="0.0" y="0.0" width="75" height="66"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <state key="normal" image="security_toogle_icon_grey.png"/>
+                                            <state key="disabled" image="security_toogle_icon_grey.png"/>
+                                        </button>
+                                        <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dH1-Al-sJ7">
+                                            <rect key="frame" x="56" y="24" width="36" height="18"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <subviews>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="security_toogle_background_green.png" translatesAutoresizingMaskIntoConstraints="NO" id="jIQ-qM-GVG" userLabel="chiffreImage">
+                                                    <rect key="frame" x="0.0" y="0.0" width="36" height="18"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                </imageView>
+                                                <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uUN-bl-g4c" userLabel="chiffreButton">
+                                                    <rect key="frame" x="20" y="2" width="14" height="14"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <state key="normal" image="security_toogle_button.png"/>
+                                                    <connections>
+                                                        <action selector="onChiffreClick:" destination="-1" eventType="touchUpInside" id="mvq-eU-bgO"/>
+                                                    </connections>
+                                                </button>
+                                            </subviews>
+                                        </view>
+                                        <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9Py-cO-YGv">
+                                            <rect key="frame" x="76" y="0.0" width="75" height="66"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <state key="normal" image="security_toogle_icon_green.png"/>
+                                            <state key="disabled" image="security_toogle_icon_green.png"/>
+                                        </button>
+                                    </subviews>
+                                </view>
                                 <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rBc-dQ-eIj" userLabel="nextButton" customClass="UIIconButton">
                                     <rect key="frame" x="300" y="0.0" width="75" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
@@ -189,5 +229,9 @@
         <image name="contacts_sip_selected.png" width="39" height="39"/>
         <image name="next_default.png" width="24" height="22"/>
         <image name="next_disabled.png" width="24" height="22"/>
+        <image name="security_toogle_background_green.png" width="52" height="27"/>
+        <image name="security_toogle_button.png" width="21" height="21"/>
+        <image name="security_toogle_icon_green.png" width="21" height="24"/>
+        <image name="security_toogle_icon_grey.png" width="21" height="24"/>
     </resources>
 </document>
diff --git a/Classes/ChatConversationCreateTableView.h b/Classes/ChatConversationCreateTableView.h
index 5de6fc8d4..a7dcdb6ad 100644
--- a/Classes/ChatConversationCreateTableView.h
+++ b/Classes/ChatConversationCreateTableView.h
@@ -20,6 +20,7 @@
 @property (weak, nonatomic) IBOutlet UIView *waitView;
 
 @property(nonatomic) Boolean isForEditing;
+@property(nonatomic) Boolean isGroupChat;
 - (void) loadData;
 
 @end
diff --git a/Classes/ChatConversationCreateTableView.m b/Classes/ChatConversationCreateTableView.m
index cc1fb0e0d..ffae06e0b 100644
--- a/Classes/ChatConversationCreateTableView.m
+++ b/Classes/ChatConversationCreateTableView.m
@@ -114,6 +114,10 @@
 	return _addresses.count;
 }
 
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(nonnull NSIndexPath *)indexPath {
+    return 60.0;
+}
+
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
 	NSString *kCellId = NSStringFromClass(UIChatCreateCell.class);
 	UIChatCreateCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellId];
@@ -133,13 +137,14 @@
 	cell.displayNameLabel.text = [FastAddressBook displayNameForAddress:addr];
 	cell.addressLabel.text = linphoneContact ? [NSString stringWithUTF8String:linphone_address_as_string(addr)] : phoneOrAddr;
 	cell.selectedImage.hidden = ![_contactsGroup containsObject:cell.addressLabel.text];
+    [cell.avatarImage setImage:[FastAddressBook imageForAddress:addr] bordered:NO withRoundedRadius:YES];
 	return cell;
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
 	UIChatCreateCell *cell = [tableView cellForRowAtIndexPath:indexPath];
 
-	if (!linphone_proxy_config_get_conference_factory_uri(linphone_core_get_default_proxy_config(LC))) {
+	if (!linphone_proxy_config_get_conference_factory_uri(linphone_core_get_default_proxy_config(LC)) || !_isGroupChat) {
 		// Create directly a basic chat room if there's no factory uri
 		bctbx_list_t *addresses = NULL;
 		LinphoneAddress *addr = linphone_address_new(cell.addressLabel.text.UTF8String);
diff --git a/Classes/ChatConversationCreateView.h b/Classes/ChatConversationCreateView.h
index 1557650e2..7db983db9 100644
--- a/Classes/ChatConversationCreateView.h
+++ b/Classes/ChatConversationCreateView.h
@@ -25,11 +25,17 @@
 @property (weak, nonatomic) IBOutlet UIIconButton *linphoneButton;
 @property (weak, nonatomic) IBOutlet UIImageView *selectedButtonImage;
 @property (weak, nonatomic) IBOutlet UIView *waitView;
+@property (weak, nonatomic) IBOutlet UIView *chiffreOptionView;
+@property (weak, nonatomic) IBOutlet UIView *switchView;
+@property (weak, nonatomic) IBOutlet UIImageView *chiffreImage;
+@property (weak, nonatomic) IBOutlet UIButton *chiffreButton;
 
 @property(nonatomic) Boolean isForEditing;
+@property(nonatomic) Boolean isGroupChat;
 
 - (IBAction)onBackClick:(id)sender;
 - (IBAction)onNextClick:(id)sender;
+- (IBAction)onChiffreClick:(id)sender;
 
 @end
 
diff --git a/Classes/ChatConversationCreateView.m b/Classes/ChatConversationCreateView.m
index 72d225601..0e66ba73e 100644
--- a/Classes/ChatConversationCreateView.m
+++ b/Classes/ChatConversationCreateView.m
@@ -54,6 +54,19 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (void)viewWillAppear:(BOOL)animated {
 	[super viewWillAppear:animated];
+
+    CGRect frame = _chiffreOptionView.frame;
+    if (_isGroupChat) {
+        _nextButton.hidden = FALSE;
+        _switchView.hidden = TRUE;
+        frame.origin.x = (self.view.frame.size.width -  _chiffreOptionView.frame.size.width)/2;
+    } else {
+        _nextButton.hidden = TRUE;
+        _switchView.hidden = FALSE;
+        frame.origin.x = self.view.frame.size.width * 0.192;
+    }
+    _chiffreOptionView.frame = frame;
+
 	_waitView.hidden = YES;
 	_backButton.hidden = IPAD;
 	if(_tableController.contactsGroup.count == 0) {
@@ -72,6 +85,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	}
 	[_collectionView reloadData];
 	_tableController.isForEditing = _isForEditing;
+    _tableController.isGroupChat = _isGroupChat;
 	[self changeView:ContactsLinphone];
 }
 
@@ -106,6 +120,21 @@ static UICompositeViewDescription *compositeDescription = nil;
 	[PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
 }
 
+- (IBAction)onChiffreClick:(id)sender {
+    CGRect frame = _chiffreButton.frame;
+    // TODO show encrypted contacts
+    if (frame.origin.x > 10) {
+        // encrypted
+        frame.origin.x = 2;
+        [_chiffreImage setImage:[UIImage imageNamed:@"security_toogle_background_grey.png"]];
+    } else {
+        // no encrypted
+        frame.origin.x = 20;
+        [_chiffreImage setImage:[UIImage imageNamed:@"security_toogle_background_green.png"]];
+    }
+    _chiffreButton.frame = frame;
+}
+
 - (void)dismissKeyboards {
 	if ([self.tableController.searchBar isFirstResponder])
 		[self.tableController.searchBar resignFirstResponder];
diff --git a/Classes/ChatsListView.h b/Classes/ChatsListView.h
index a44b383b1..25fa8e88c 100644
--- a/Classes/ChatsListView.h
+++ b/Classes/ChatsListView.h
@@ -34,7 +34,7 @@
 @property(weak, nonatomic) IBOutlet UIBackToCallButton *backToCallButton;
 @property (weak, nonatomic) IBOutlet UIView *waitView;
 
-- (IBAction)onAddGroupChatClick:(id)sender;
+- (IBAction)onAddGroupChatClick:(id)event;
 - (IBAction)onAddClick:(id)event;
 - (IBAction)onEditionChangeClick:(id)sender;
 - (IBAction)onDeleteClick:(id)sender;
diff --git a/Classes/ChatsListView.m b/Classes/ChatsListView.m
index e9bba2b33..b44e3c89c 100644
--- a/Classes/ChatsListView.m
+++ b/Classes/ChatsListView.m
@@ -80,22 +80,21 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 #pragma mark - Action Functions
 
-- (IBAction)onAddGroupChatClick:(id)sender {
-    // TODO create group chat
+- (void)newChatCreate:(BOOL)isGroup {
     ChatConversationCreateView *view = VIEW(ChatConversationCreateView);
     view.isForEditing = false;
+    view.isGroupChat = isGroup;
     view.tableController.notFirstTime = FALSE;
     [view.tableController.contactsGroup removeAllObjects];
     [PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
 }
 
+- (IBAction)onAddGroupChatClick:(id)event {
+    [self newChatCreate:TRUE];
+}
+
 - (IBAction)onAddClick:(id)event {
-    // TODO create one-to-one chat
-	ChatConversationCreateView *view = VIEW(ChatConversationCreateView);
-	view.isForEditing = false;
-	view.tableController.notFirstTime = FALSE;
-	[view.tableController.contactsGroup removeAllObjects];
-	[PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
+	[self newChatCreate:FALSE];
 }
 
 - (IBAction)onEditionChangeClick:(id)sender {
diff --git a/Classes/LinphoneUI/Base.lproj/UIChatCreateCell.xib b/Classes/LinphoneUI/Base.lproj/UIChatCreateCell.xib
index afcfbdb1e..4b652950a 100644
--- a/Classes/LinphoneUI/Base.lproj/UIChatCreateCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIChatCreateCell.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -12,39 +12,48 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UIChatCreateCell">
             <connections>
                 <outlet property="addressLabel" destination="Bjy-H9-VyJ" id="YFi-IY-Omd"/>
+                <outlet property="avatarImage" destination="ktO-jm-Ra6" id="IFH-3K-TdW"/>
                 <outlet property="displayNameLabel" destination="Hrt-Iz-T2j" id="0tY-FY-dFe"/>
                 <outlet property="linphoneImage" destination="vhd-fK-M2m" id="hO8-lY-0Hh"/>
                 <outlet property="selectedImage" destination="qMd-eD-DOW" id="m79-nU-deW"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="WTc-GF-a0y">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="40"/>
+        <view contentMode="scaleToFill" misplaced="YES" id="WTc-GF-a0y">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
             <subviews>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="john.doe@linphone.org" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Bjy-H9-VyJ" userLabel="addressLabel">
-                    <rect key="frame" x="3" y="22" width="303" height="16"/>
+                    <rect key="frame" x="65" y="30" width="238" height="22"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" red="0.98766469955444336" green="0.27512490749359131" blue="0.029739789664745331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="John Doe" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Hrt-Iz-T2j" userLabel="displayNameLabel">
-                    <rect key="frame" x="3" y="0.0" width="303" height="22"/>
+                    <rect key="frame" x="65" y="6" width="238" height="28"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" image="check_selected.png" id="qMd-eD-DOW" userLabel="selectedImage">
-                    <rect key="frame" x="347" y="9" width="21" height="22"/>
+                    <rect key="frame" x="347" y="21" width="21" height="22"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                 </imageView>
                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" image="linphone_user.png" id="vhd-fK-M2m" userLabel="linphoneImage">
-                    <rect key="frame" x="314" y="8" width="25" height="25"/>
+                    <rect key="frame" x="314" y="21" width="21" height="21"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                     <accessibility key="accessibilityConfiguration" label="Linphone"/>
                 </imageView>
+                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" misplaced="YES" image="avatar.png" id="ktO-jm-Ra6" userLabel="avatarImage" customClass="UIRoundedImageView">
+                    <rect key="frame" x="10" y="10" width="40" height="40"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                </imageView>
+                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" misplaced="YES" image="security_toogle_icon_green.png" id="ioo-eB-vvQ" userLabel="securityImage">
+                    <rect key="frame" x="40" y="11" width="18" height="23"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                </imageView>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <nil key="simulatedStatusBarMetrics"/>
@@ -53,7 +62,9 @@
         </view>
     </objects>
     <resources>
+        <image name="avatar.png" width="259" height="259"/>
         <image name="check_selected.png" width="47" height="32"/>
         <image name="linphone_user.png" width="26" height="26"/>
+        <image name="security_toogle_icon_green.png" width="21" height="24"/>
     </resources>
 </document>
diff --git a/Classes/LinphoneUI/UIChatCreateCell.h b/Classes/LinphoneUI/UIChatCreateCell.h
index 424683497..f0b1b93ec 100644
--- a/Classes/LinphoneUI/UIChatCreateCell.h
+++ b/Classes/LinphoneUI/UIChatCreateCell.h
@@ -13,6 +13,7 @@
 @property(weak, nonatomic) IBOutlet UILabel *addressLabel;
 @property (weak, nonatomic) IBOutlet UIImageView *selectedImage;
 @property (weak, nonatomic) IBOutlet UIImageView *linphoneImage;
+@property (weak, nonatomic) IBOutlet UIRoundedImageView *avatarImage;
 
 - (id)initWithIdentifier:(NSString *)identifier;
 
diff --git a/Resources/images/security_toogle_background_green.png b/Resources/images/security_toogle_background_green.png
new file mode 100644
index 000000000..2a01da72e
Binary files /dev/null and b/Resources/images/security_toogle_background_green.png differ
diff --git a/Resources/images/security_toogle_background_green@2x.png b/Resources/images/security_toogle_background_green@2x.png
new file mode 100644
index 000000000..2a01da72e
Binary files /dev/null and b/Resources/images/security_toogle_background_green@2x.png differ
diff --git a/Resources/images/security_toogle_background_grey.png b/Resources/images/security_toogle_background_grey.png
new file mode 100644
index 000000000..6ff74ca8b
Binary files /dev/null and b/Resources/images/security_toogle_background_grey.png differ
diff --git a/Resources/images/security_toogle_background_grey@2x.png b/Resources/images/security_toogle_background_grey@2x.png
new file mode 100644
index 000000000..6ff74ca8b
Binary files /dev/null and b/Resources/images/security_toogle_background_grey@2x.png differ
diff --git a/Resources/images/security_toogle_button.png b/Resources/images/security_toogle_button.png
new file mode 100644
index 000000000..b2d565561
Binary files /dev/null and b/Resources/images/security_toogle_button.png differ
diff --git a/Resources/images/security_toogle_button@2x.png b/Resources/images/security_toogle_button@2x.png
new file mode 100644
index 000000000..b2d565561
Binary files /dev/null and b/Resources/images/security_toogle_button@2x.png differ
diff --git a/Resources/images/security_toogle_icon_green.png b/Resources/images/security_toogle_icon_green.png
new file mode 100644
index 000000000..c8b537fe2
Binary files /dev/null and b/Resources/images/security_toogle_icon_green.png differ
diff --git a/Resources/images/security_toogle_icon_green@2x.png b/Resources/images/security_toogle_icon_green@2x.png
new file mode 100644
index 000000000..320dd4570
Binary files /dev/null and b/Resources/images/security_toogle_icon_green@2x.png differ
diff --git a/Resources/images/security_toogle_icon_grey.png b/Resources/images/security_toogle_icon_grey.png
new file mode 100644
index 000000000..61514c02b
Binary files /dev/null and b/Resources/images/security_toogle_icon_grey.png differ
diff --git a/Resources/images/security_toogle_icon_grey@2x.png b/Resources/images/security_toogle_icon_grey@2x.png
new file mode 100644
index 000000000..8627c1ab9
Binary files /dev/null and b/Resources/images/security_toogle_icon_grey@2x.png differ
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index ae2c94d47..de82d5a87 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -104,6 +104,16 @@
 		615A281D217F6FA80060F920 /* security_2_indicator@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 615A281C217F6FA80060F920 /* security_2_indicator@2x.png */; };
 		615A281F217F6FB40060F920 /* security_alert_indicator.png in Resources */ = {isa = PBXBuildFile; fileRef = 615A281E217F6FB30060F920 /* security_alert_indicator.png */; };
 		615A2821217F6FBF0060F920 /* security_alert_indicator@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 615A2820217F6FBF0060F920 /* security_alert_indicator@2x.png */; };
+		615A282421805B260060F920 /* security_toogle_icon_green.png in Resources */ = {isa = PBXBuildFile; fileRef = 615A282321805B250060F920 /* security_toogle_icon_green.png */; };
+		615A282621805B320060F920 /* security_toogle_icon_green@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 615A282521805B320060F920 /* security_toogle_icon_green@2x.png */; };
+		615A282821805B400060F920 /* security_toogle_icon_grey.png in Resources */ = {isa = PBXBuildFile; fileRef = 615A282721805B400060F920 /* security_toogle_icon_grey.png */; };
+		615A282A21805B4C0060F920 /* security_toogle_icon_grey@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 615A282921805B4C0060F920 /* security_toogle_icon_grey@2x.png */; };
+		615A2830218071E80060F920 /* security_toogle_background_green.png in Resources */ = {isa = PBXBuildFile; fileRef = 615A282F218071E80060F920 /* security_toogle_background_green.png */; };
+		615A2832218071F30060F920 /* security_toogle_background_green@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 615A2831218071F30060F920 /* security_toogle_background_green@2x.png */; };
+		615A2834218071FF0060F920 /* security_toogle_background_grey.png in Resources */ = {isa = PBXBuildFile; fileRef = 615A2833218071FF0060F920 /* security_toogle_background_grey.png */; };
+		615A28362180720D0060F920 /* security_toogle_background_grey@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 615A28352180720D0060F920 /* security_toogle_background_grey@2x.png */; };
+		615A283A2180788E0060F920 /* security_toogle_button.png in Resources */ = {isa = PBXBuildFile; fileRef = 615A28392180788E0060F920 /* security_toogle_button.png */; };
+		615A283C2180789C0060F920 /* security_toogle_button@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 615A283B2180789C0060F920 /* security_toogle_button@2x.png */; };
 		61AE364F20C00B370089D9D3 /* ShareViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61AE364E20C00B370089D9D3 /* ShareViewController.m */; };
 		61AE365220C00B370089D9D3 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 61AE365020C00B370089D9D3 /* MainInterface.storyboard */; };
 		61AE365620C00B370089D9D3 /* linphoneExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 61AE364B20C00B370089D9D3 /* linphoneExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@@ -1155,6 +1165,16 @@
 		615A281C217F6FA80060F920 /* security_2_indicator@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "security_2_indicator@2x.png"; sourceTree = "<group>"; };
 		615A281E217F6FB30060F920 /* security_alert_indicator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = security_alert_indicator.png; sourceTree = "<group>"; };
 		615A2820217F6FBF0060F920 /* security_alert_indicator@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "security_alert_indicator@2x.png"; sourceTree = "<group>"; };
+		615A282321805B250060F920 /* security_toogle_icon_green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = security_toogle_icon_green.png; sourceTree = "<group>"; };
+		615A282521805B320060F920 /* security_toogle_icon_green@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "security_toogle_icon_green@2x.png"; sourceTree = "<group>"; };
+		615A282721805B400060F920 /* security_toogle_icon_grey.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = security_toogle_icon_grey.png; sourceTree = "<group>"; };
+		615A282921805B4C0060F920 /* security_toogle_icon_grey@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "security_toogle_icon_grey@2x.png"; sourceTree = "<group>"; };
+		615A282F218071E80060F920 /* security_toogle_background_green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = security_toogle_background_green.png; sourceTree = "<group>"; };
+		615A2831218071F30060F920 /* security_toogle_background_green@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "security_toogle_background_green@2x.png"; sourceTree = "<group>"; };
+		615A2833218071FF0060F920 /* security_toogle_background_grey.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = security_toogle_background_grey.png; sourceTree = "<group>"; };
+		615A28352180720D0060F920 /* security_toogle_background_grey@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "security_toogle_background_grey@2x.png"; sourceTree = "<group>"; };
+		615A28392180788E0060F920 /* security_toogle_button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = security_toogle_button.png; sourceTree = "<group>"; };
+		615A283B2180789C0060F920 /* security_toogle_button@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "security_toogle_button@2x.png"; sourceTree = "<group>"; };
 		61AE364B20C00B370089D9D3 /* linphoneExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = linphoneExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		61AE364D20C00B370089D9D3 /* ShareViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShareViewController.h; sourceTree = "<group>"; };
 		61AE364E20C00B370089D9D3 /* ShareViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShareViewController.m; sourceTree = "<group>"; };
@@ -3220,6 +3240,16 @@
 				633FED831D3CD5590014B822 /* security_ok@2x.png */,
 				633FED841D3CD5590014B822 /* security_pending.png */,
 				633FED851D3CD5590014B822 /* security_pending@2x.png */,
+				615A282F218071E80060F920 /* security_toogle_background_green.png */,
+				615A2831218071F30060F920 /* security_toogle_background_green@2x.png */,
+				615A2833218071FF0060F920 /* security_toogle_background_grey.png */,
+				615A28352180720D0060F920 /* security_toogle_background_grey@2x.png */,
+				615A28392180788E0060F920 /* security_toogle_button.png */,
+				615A283B2180789C0060F920 /* security_toogle_button@2x.png */,
+				615A282321805B250060F920 /* security_toogle_icon_green.png */,
+				615A282521805B320060F920 /* security_toogle_icon_green@2x.png */,
+				615A282721805B400060F920 /* security_toogle_icon_grey.png */,
+				615A282921805B4C0060F920 /* security_toogle_icon_grey@2x.png */,
 				633FED861D3CD5590014B822 /* select_all_default.png */,
 				633FED871D3CD5590014B822 /* select_all_default@2x.png */,
 				633FED881D3CD5590014B822 /* select_all_disabled.png */,
@@ -3996,6 +4026,7 @@
 				633FEDFD1D3CD5590014B822 /* camera_switch_default@2x.png in Resources */,
 				633FEEC51D3CD55A0014B822 /* numpad_5_over.png in Resources */,
 				633FEE721D3CD5590014B822 /* history_all_default.png in Resources */,
+				615A283C2180789C0060F920 /* security_toogle_button@2x.png in Resources */,
 				633FEF0A1D3CD55A0014B822 /* options_transfer_call_default.png in Resources */,
 				633FEDA51D3CD5590014B822 /* back_default@2x.png in Resources */,
 				633FEF311D3CD55A0014B822 /* route_speaker_disabled@2x.png in Resources */,
@@ -4029,6 +4060,7 @@
 				633FEE801D3CD5590014B822 /* led_connected.png in Resources */,
 				633FEEF41D3CD55A0014B822 /* numpad_star_default.png in Resources */,
 				61586B93217A17700038AC45 /* menu_recordings@2x.png in Resources */,
+				615A2834218071FF0060F920 /* security_toogle_background_grey.png in Resources */,
 				633FEDDE1D3CD5590014B822 /* call_start_body_over.png in Resources */,
 				24BFAAA0209B0630004F47A7 /* contacts_sip_default@2x.png in Resources */,
 				8CF25D9D1F9F76BD00BEA0C1 /* chat_group_informations.png in Resources */,
@@ -4046,10 +4078,12 @@
 				615A2811217F1FDE0060F920 /* chat_add_group@2x.png in Resources */,
 				D34F6F9E1594D3FB0095705B /* InAppSettings.bundle in Resources */,
 				633FEE4D1D3CD5590014B822 /* delete_field_default@2x.png in Resources */,
+				615A28362180720D0060F920 /* security_toogle_background_grey@2x.png in Resources */,
 				639CEB091A1DF4FA004DE38F /* UIChatCell.xib in Resources */,
 				633FEE961D3CD55A0014B822 /* micro_disabled.png in Resources */,
 				63AADBF61B6A0FF200AA16FD /* linphonerc-factory in Resources */,
 				633FEE671D3CD5590014B822 /* footer_contacts_default@2x.png in Resources */,
+				615A2830218071E80060F920 /* security_toogle_background_green.png in Resources */,
 				63B8D68C1BCBE65600C12B09 /* ChatConversationCreateView.xib in Resources */,
 				D38187D915FE347700C3EDCA /* CallIncomingView.xib in Resources */,
 				63CDC45F1C3BDE370085F529 /* ringback.wav in Resources */,
@@ -4057,6 +4091,7 @@
 				633FEE251D3CD5590014B822 /* chat_start_body_over~ipad@2x.png in Resources */,
 				633FEDF91D3CD5590014B822 /* camera_disabled@2x.png in Resources */,
 				633FEE161D3CD5590014B822 /* chat_send_disabled.png in Resources */,
+				615A282421805B260060F920 /* security_toogle_icon_green.png in Resources */,
 				633FEE1A1D3CD5590014B822 /* chat_start_body_default.png in Resources */,
 				633FEF041D3CD55A0014B822 /* options_selected.png in Resources */,
 				633FEEE61D3CD55A0014B822 /* numpad_9_over@2x.png in Resources */,
@@ -4079,6 +4114,7 @@
 				633FEF441D3CD55A0014B822 /* speaker_default.png in Resources */,
 				639CEB031A1DF4EB004DE38F /* UICompositeView.xib in Resources */,
 				633FEF3A1D3CD55A0014B822 /* security_ko.png in Resources */,
+				615A283A2180788E0060F920 /* security_toogle_button.png in Resources */,
 				633FEDA01D3CD5590014B822 /* avatar.png in Resources */,
 				633FEEBC1D3CD55A0014B822 /* numpad_4_default@2x.png in Resources */,
 				633FEEA91D3CD55A0014B822 /* numpad_1~ipad.png in Resources */,
@@ -4091,6 +4127,7 @@
 				63AADBF81B6A0FF200AA16FD /* linphonerc~ipad in Resources */,
 				633FEE8F1D3CD55A0014B822 /* list_details_default@2x.png in Resources */,
 				633FEE5E1D3CD5590014B822 /* edit_list_default.png in Resources */,
+				615A282621805B320060F920 /* security_toogle_icon_green@2x.png in Resources */,
 				633FEDB11D3CD5590014B822 /* call_add_disabled@2x.png in Resources */,
 				CF7602F7210898CC00749F76 /* rec_off_default.png in Resources */,
 				633FEDB21D3CD5590014B822 /* call_alt_back_default.png in Resources */,
@@ -4148,6 +4185,7 @@
 				633FEE7C1D3CD5590014B822 /* history_missed_disabled.png in Resources */,
 				CF1DE92E210A0F5D00A0A97E /* UILinphoneAudioPlayer.xib in Resources */,
 				633FEDF11D3CD5590014B822 /* call_transfer_disabled@2x.png in Resources */,
+				615A282821805B400060F920 /* security_toogle_icon_grey.png in Resources */,
 				633FEDFF1D3CD5590014B822 /* camera_switch_disabled@2x.png in Resources */,
 				633FEDDF1D3CD5590014B822 /* call_start_body_over@2x.png in Resources */,
 				633FEEFA1D3CD55A0014B822 /* numpad_star~ipad.png in Resources */,
@@ -4227,6 +4265,7 @@
 				63B81A0C1B57DA33009604A6 /* LICENSE.txt in Resources */,
 				633FEEDA1D3CD55A0014B822 /* numpad_7~ipad@2x.png in Resources */,
 				633FEE5D1D3CD5590014B822 /* edit_disabled@2x.png in Resources */,
+				615A2832218071F30060F920 /* security_toogle_background_green@2x.png in Resources */,
 				633FEEC11D3CD55A0014B822 /* numpad_4~ipad.png in Resources */,
 				633FEE6B1D3CD5590014B822 /* footer_dialer_default@2x.png in Resources */,
 				633FEE0E1D3CD5590014B822 /* chat_attachment_over.png in Resources */,
@@ -4303,6 +4342,7 @@
 				633FEDBA1D3CD5590014B822 /* call_audio_start_default.png in Resources */,
 				61586B8F217A174F0038AC45 /* menu_options@2x.png in Resources */,
 				633FEE131D3CD5590014B822 /* chat_message_not_delivered@2x.png in Resources */,
+				615A282A21805B4C0060F920 /* security_toogle_icon_grey@2x.png in Resources */,
 				63AADBF51B6A0FF200AA16FD /* linphonerc in Resources */,
 				633FEF0C1D3CD55A0014B822 /* options_transfer_call_disabled.png in Resources */,
 				633FEE911D3CD55A0014B822 /* list_details_over@2x.png in Resources */,