From e23a4a7951abbe9ef5a4a362f6a22b939470f13d Mon Sep 17 00:00:00 2001
From: Christophe Deschamps <christophe.deschamps.work@gmail.com>
Date: Tue, 4 Jan 2022 12:27:03 +0100
Subject: [PATCH] Revert "Conference creating/scheduling"

This reverts commit 5f640551ddacb8885c03a6f0227fb99b4fe0c234.
---
 .../Base.lproj/ChatConversationCreateView.xib |  61 ++---
 Classes/Base.lproj/DialerView.xib             |   2 +-
 Classes/Base.lproj/DialerView~ipad.xib        |   2 +-
 Classes/ChatConversationCreateView.h          |   3 -
 Classes/ChatConversationCreateView.m          |  42 +---
 Classes/ChatConversationInfoView.m            |   2 -
 Classes/ChatsListTableView.m                  |   1 -
 Classes/ChatsListView.m                       |   1 -
 Classes/Conference/data/Duration.swift        |  31 ---
 .../data/ScheduledConferenceData.swift        |  79 ------
 Classes/Conference/data/TimeZoneData.swift    |  60 -----
 .../ConferenceSchedulingViewModel.swift       | 238 ------------------
 .../ConferenceSchedulingSummaryView.swift     | 223 ----------------
 .../views/ConferenceSchedulingView.swift      | 206 ---------------
 Classes/DialerView.h                          |   2 +-
 Classes/DialerView.m                          |  16 +-
 .../Base.lproj/UIChatCreateCell.xib           |  14 +-
 Classes/LinphoneUI/StatusBarView.m            |   2 -
 .../Extensions/IOS/OptionalExtensions.swift   |  15 +-
 .../Extensions/IOS/UIButtonExtensions.swift   |  30 ---
 .../Extensions/IOS/UILabelExtensions.swift    |  32 ---
 .../Extensions/IOS/UIVIewExtensions.swift     |  61 +----
 .../GenericViews/NavigationView.swift         |  93 -------
 Classes/SwiftUtil/TimestampUtils.swift        |  65 -----
 .../ViewModel/MediatorLiveData.swift          |  48 ----
 Classes/Voip/Models/ControlsViewModel.swift   |   2 +-
 Classes/Voip/Theme/TextStyle.swift            |  34 +--
 Classes/Voip/Theme/VoipTexts.swift            |   4 +-
 Classes/Voip/Theme/VoipTheme.swift            |  16 --
 .../Views/Fragments/AudioRoutesView.swift     |   3 -
 .../VoipParticipantCell.swift                 |  26 +-
 Classes/Voip/Widgets/Avatar.swift             |   1 +
 .../Widgets/ButtonWithStateBackgrounds.swift  |   3 +-
 Classes/Voip/Widgets/FormButton.swift         |  50 ----
 Classes/Voip/Widgets/StyledCheckBox.swift     |  54 ----
 Classes/Voip/Widgets/StyledDatePicker.swift   |  77 ------
 Classes/Voip/Widgets/StyledSwitch.swift       |  46 ----
 Classes/Voip/Widgets/StyledTextView.swift     |  77 ------
 Classes/Voip/Widgets/StyledValuePicker.swift  | 100 --------
 Podfile                                       |   2 -
 .../images/security_toggle_icon_green.png     | Bin 1870 -> 0 bytes
 .../images/security_toggle_icon_grey.png      | Bin 2420 -> 0 bytes
 Resources/images/voip_checkbox_checked.png    | Bin 355 -> 0 bytes
 Resources/images/voip_checkbox_unchecked.png  | Bin 208 -> 0 bytes
 linphone.xcodeproj/project.pbxproj            | 136 +---------
 45 files changed, 66 insertions(+), 1894 deletions(-)
 delete mode 100644 Classes/Conference/data/Duration.swift
 delete mode 100644 Classes/Conference/data/ScheduledConferenceData.swift
 delete mode 100644 Classes/Conference/data/TimeZoneData.swift
 delete mode 100644 Classes/Conference/viewmodels/ConferenceSchedulingViewModel.swift
 delete mode 100644 Classes/Conference/views/ConferenceSchedulingSummaryView.swift
 delete mode 100644 Classes/Conference/views/ConferenceSchedulingView.swift
 delete mode 100644 Classes/SwiftUtil/Extensions/IOS/UIButtonExtensions.swift
 delete mode 100644 Classes/SwiftUtil/Extensions/IOS/UILabelExtensions.swift
 delete mode 100644 Classes/SwiftUtil/GenericViews/NavigationView.swift
 delete mode 100644 Classes/SwiftUtil/TimestampUtils.swift
 delete mode 100644 Classes/SwiftUtil/ViewModel/MediatorLiveData.swift
 delete mode 100644 Classes/Voip/Widgets/FormButton.swift
 delete mode 100644 Classes/Voip/Widgets/StyledCheckBox.swift
 delete mode 100644 Classes/Voip/Widgets/StyledDatePicker.swift
 delete mode 100644 Classes/Voip/Widgets/StyledSwitch.swift
 delete mode 100644 Classes/Voip/Widgets/StyledTextView.swift
 delete mode 100644 Classes/Voip/Widgets/StyledValuePicker.swift
 delete mode 100644 Resources/images/security_toggle_icon_green.png
 delete mode 100644 Resources/images/security_toggle_icon_grey.png
 delete mode 100644 Resources/images/voip_checkbox_checked.png
 delete mode 100644 Resources/images/voip_checkbox_unchecked.png

diff --git a/Classes/Base.lproj/ChatConversationCreateView.xib b/Classes/Base.lproj/ChatConversationCreateView.xib
index 8088da47f..c2ac45000 100644
--- a/Classes/Base.lproj/ChatConversationCreateView.xib
+++ b/Classes/Base.lproj/ChatConversationCreateView.xib
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -22,7 +19,6 @@
                 <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="voipTitle" destination="U0U-ez-rgF" id="yEI-Gk-LdN"/>
                 <outlet property="waitView" destination="Ztm-hK-aBp" id="qYh-M5-heN"/>
             </connections>
         </placeholder>
@@ -33,23 +29,23 @@
             </connections>
         </tapGestureRecognizer>
         <view contentMode="scaleToFill" id="WKv-mw-S2B" userLabel="iphone6MetricsView">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5">
-                    <rect key="frame" x="0.0" y="42" width="414" height="788"/>
+                    <rect key="frame" x="0.0" y="42" width="375" height="559"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
                         <view alpha="0.90000000000000002" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7" userLabel="topBar">
-                            <rect key="frame" x="0.0" y="0.0" width="414" height="66"/>
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="66"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="d5Q-XR-FNz" userLabel="switchView">
-                                    <rect key="frame" x="248" y="0.0" width="166" 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="UIInterfaceStyleButton">
-                                            <rect key="frame" x="0.0" y="0.0" width="83" height="66"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="75" height="66"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                             <accessibility key="accessibilityConfiguration" label="All contacts filter"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="9"/>
@@ -69,11 +65,11 @@
                                             </connections>
                                         </button>
                                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="color_A.png" translatesAutoresizingMaskIntoConstraints="NO" id="ibu-Ra-oZO" userLabel="selectedButtonImage">
-                                            <rect key="frame" x="0.0" y="63" width="83" height="3"/>
+                                            <rect key="frame" x="0.0" y="63" width="75" height="3"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                         </imageView>
                                         <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8lQ-fv-INK" userLabel="sipButton" customClass="UIInterfaceStyleButton">
-                                            <rect key="frame" x="83" y="0.0" width="83" height="66"/>
+                                            <rect key="frame" x="75" y="0.0" width="75" height="66"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/>
                                             <accessibility key="accessibilityConfiguration" label="Linphone contacts filter"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="9"/>
@@ -93,7 +89,7 @@
                                     </subviews>
                                 </view>
                                 <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fNt-yb-wsf" userLabel="backButton" customClass="UIInterfaceStyleButton">
-                                    <rect key="frame" x="0.0" y="0.0" width="82" height="66"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="75" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Back"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -146,15 +142,8 @@
                                         </button>
                                     </subviews>
                                 </view>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U0U-ez-rgF">
-                                    <rect key="frame" x="82" y="0.0" width="249" height="66"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="22"/>
-                                    <nil key="textColor"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
                                 <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rBc-dQ-eIj" userLabel="nextButton" customClass="UIInterfaceStyleButton">
-                                    <rect key="frame" x="331" y="0.0" width="83" height="66"/>
+                                    <rect key="frame" x="300" y="0.0" width="75" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Back">
                                         <bool key="isElement" value="YES"/>
@@ -171,18 +160,18 @@
                                     </connections>
                                 </button>
                             </subviews>
-                            <color key="backgroundColor" systemColor="secondarySystemBackgroundColor"/>
+                            <color key="backgroundColor" systemColor="secondarySystemBackgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </view>
                         <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KRQ-Fm-3cQ" userLabel="addedContacts" customClass="UICollectionView">
-                            <rect key="frame" x="8" y="110" width="398" height="70"/>
+                            <rect key="frame" x="8" y="110" width="359" height="70"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                             <accessibility key="accessibilityConfiguration" label="addedContacts"/>
                         </view>
                         <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" style="plain" separatorStyle="default" allowsSelectionDuringEditing="YES" allowsMultipleSelectionDuringEditing="YES" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="6">
-                            <rect key="frame" x="5" y="178" width="403" height="610"/>
+                            <rect key="frame" x="5" y="178" width="365" height="381"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                             <color key="separatorColor" red="0.67030966281890869" green="0.71867996454238892" blue="0.75078284740447998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <connections>
                                 <outlet property="dataSource" destination="4" id="11"/>
@@ -190,7 +179,7 @@
                             </connections>
                         </tableView>
                         <searchBar contentMode="redraw" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Rd9-hK-nqR" userLabel="Contact address">
-                            <rect key="frame" x="0.0" y="66" width="414" height="44"/>
+                            <rect key="frame" x="0.0" y="66" width="375" height="44"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no"/>
                             <connections>
@@ -198,23 +187,23 @@
                             </connections>
                         </searchBar>
                         <view hidden="YES" tag="8" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ztm-hK-aBp" userLabel="waitView">
-                            <rect key="frame" x="0.0" y="0.0" width="414" height="788"/>
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="559"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <activityIndicatorView opaque="NO" tag="9" contentMode="scaleToFill" fixedFrame="YES" animating="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="nqH-qD-vgE" userLabel="activityIndicatorView">
-                                    <rect key="frame" x="198" y="380" width="20" height="20"/>
+                                    <rect key="frame" x="179" y="267" width="20" height="20"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                 </activityIndicatorView>
                             </subviews>
-                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                             <gestureRecognizers/>
                         </view>
                     </subviews>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                 </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-            <point key="canvasLocation" x="52.173913043478265" y="80.357142857142847"/>
+            <point key="canvasLocation" x="53.600000000000001" y="80.50974512743629"/>
         </view>
         <tableViewController autoresizesArchivedViewToFullSize="NO" id="4" userLabel="Suggested addresses" customClass="ChatConversationCreateTableView">
             <extendedEdge key="edgesForExtendedLayout"/>
@@ -244,11 +233,5 @@
         <image name="security_toogle_button.png" width="21" height="21"/>
         <image name="security_toogle_icon_green.png" width="33.599998474121094" height="38.400001525878906"/>
         <image name="security_toogle_icon_grey.png" width="33.599998474121094" height="38.400001525878906"/>
-        <systemColor name="secondarySystemBackgroundColor">
-            <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </systemColor>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
     </resources>
 </document>
diff --git a/Classes/Base.lproj/DialerView.xib b/Classes/Base.lproj/DialerView.xib
index 8bb5e0c52..e71288e54 100644
--- a/Classes/Base.lproj/DialerView.xib
+++ b/Classes/Base.lproj/DialerView.xib
@@ -270,7 +270,7 @@
                                     <state key="disabled" image="contact_add_disabled.png"/>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
                                     <connections>
-                                        <action selector="onVoipConferenceCreateClick:" destination="-1" eventType="touchUpInside" id="230"/>
+                                        <action selector="onAddContactClick:" destination="-1" eventType="touchUpInside" id="230"/>
                                     </connections>
                                 </button>
                                 <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="224" userLabel="callButton" customClass="UICallButton">
diff --git a/Classes/Base.lproj/DialerView~ipad.xib b/Classes/Base.lproj/DialerView~ipad.xib
index 2f8e86f93..1b50b5abc 100644
--- a/Classes/Base.lproj/DialerView~ipad.xib
+++ b/Classes/Base.lproj/DialerView~ipad.xib
@@ -281,7 +281,7 @@
                                             <state key="disabled" image="contact_add_disabled.png"/>
                                             <state key="highlighted" backgroundImage="color_E.png"/>
                                             <connections>
-                                                <action selector="onVoipConferenceCreateClick:" destination="-1" eventType="touchUpInside" id="230"/>
+                                                <action selector="onAddContactClick:" destination="-1" eventType="touchUpInside" id="230"/>
                                             </connections>
                                         </button>
                                         <button opaque="NO" tag="25" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="224" userLabel="callButton" customClass="UICallButton">
diff --git a/Classes/ChatConversationCreateView.h b/Classes/ChatConversationCreateView.h
index b51116e61..557035c29 100644
--- a/Classes/ChatConversationCreateView.h
+++ b/Classes/ChatConversationCreateView.h
@@ -45,9 +45,6 @@
 @property(nonatomic) Boolean isGroupChat;
 @property(nonatomic) Boolean isEncrypted;
 
-@property(nonatomic) Boolean isForVoipConference;
-@property (weak, nonatomic) IBOutlet UILabel *voipTitle;
-
 - (IBAction)onBackClick:(id)sender;
 - (IBAction)onNextClick:(id)sender;
 - (IBAction)onChiffreClick:(id)sender;
diff --git a/Classes/ChatConversationCreateView.m b/Classes/ChatConversationCreateView.m
index 83eacf09a..9f81e8a41 100644
--- a/Classes/ChatConversationCreateView.m
+++ b/Classes/ChatConversationCreateView.m
@@ -20,7 +20,6 @@
 #import "ChatConversationCreateView.h"
 #import "PhoneMainView.h"
 #import "UIChatCreateCollectionViewCell.h"
-#import "linphoneapp-Swift.h"
 
 @implementation ChatConversationCreateView
 
@@ -61,9 +60,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	[_collectionView setCollectionViewLayout:layout];
 	_tableController.collectionView = _collectionView;
 	_tableController.controllerNextButton = _nextButton;
-	_isForEditing = FALSE;
-	_voipTitle.text = VoipTexts.call_action_participants_list;
-
+	_isForEditing = FALSE; 
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -84,16 +81,6 @@ static UICompositeViewDescription *compositeDescription = nil;
 		frame.origin.x = _linphoneButton.frame.origin.x;
 		_allButton.frame = frame;
 	}
-	
-	
-	if (_isForVoipConference) {
-		_switchView.hidden = true;
-		_chiffreOptionView.hidden = true;
-		_voipTitle.hidden = false;
-	} else {
-		_voipTitle.hidden = true;
-	}
-	
 }
 
 - (void)viewUpdateEvent:(NSNotification *)notif {
@@ -159,27 +146,18 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (IBAction)onBackClick:(id)sender {
 	[_tableController.contactsGroup removeAllObjects];
-	if (_isForVoipConference) {
-		[PhoneMainView.instance popToView:ConferenceSchedulingView.compositeViewDescription];
-	} else {
-		if (_tableController.isForEditing)
-			[PhoneMainView.instance popToView:ChatConversationInfoView.compositeViewDescription];
-		else
-			[PhoneMainView.instance popToView:ChatsListView.compositeViewDescription];
-	}
+	if (_tableController.isForEditing)
+		[PhoneMainView.instance popToView:ChatConversationInfoView.compositeViewDescription];
+	else
+		[PhoneMainView.instance popToView:ChatsListView.compositeViewDescription];
 }
 
 - (IBAction)onNextClick:(id)sender {
-	if (_isForVoipConference) {
-		[PhoneMainView.instance changeCurrentView:VIEW(ConferenceSchedulingSummaryView).compositeViewDescription];
-		[VIEW(ConferenceSchedulingSummaryView) setParticipantsWithAddresses:_tableController.contactsGroup];
-	} else {
-		ChatConversationInfoView *view = VIEW(ChatConversationInfoView);
-		view.contacts = _tableController.contactsGroup;
-		view.create = !_isForEditing;
-    	view.encrypted = _isEncrypted;
-		[PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
-	}
+	ChatConversationInfoView *view = VIEW(ChatConversationInfoView);
+	view.contacts = _tableController.contactsGroup;
+	view.create = !_isForEditing;
+    view.encrypted = _isEncrypted;
+	[PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
 }
 
 - (IBAction)onChiffreClick:(id)sender {
diff --git a/Classes/ChatConversationInfoView.m b/Classes/ChatConversationInfoView.m
index 652dffc83..ef9d61714 100644
--- a/Classes/ChatConversationInfoView.m
+++ b/Classes/ChatConversationInfoView.m
@@ -255,7 +255,6 @@ static UICompositeViewDescription *compositeDescription = nil;
 		view.tableController.contactsGroup = [_contacts mutableCopy];
 		view.tableController.notFirstTime = TRUE;
 		view.isForEditing = FALSE;
-		view.isForVoipConference = FALSE;
 		[PhoneMainView.instance popToView:view.compositeViewDescription];
 	} else {
 		ChatConversationView *view = VIEW(ChatConversationView);
@@ -281,7 +280,6 @@ static UICompositeViewDescription *compositeDescription = nil;
 		view.tableController.notFirstTime = TRUE;
 		view.isForEditing = !_create;
 		view.isGroupChat = TRUE;
-		view.isForVoipConference = FALSE;
 		view.tableController.contactsGroup = [_contacts mutableCopy];
 		[PhoneMainView.instance popToView:view.compositeViewDescription];
 	}
diff --git a/Classes/ChatsListTableView.m b/Classes/ChatsListTableView.m
index 6f8c3fd36..e8ed14c76 100644
--- a/Classes/ChatsListTableView.m
+++ b/Classes/ChatsListTableView.m
@@ -126,7 +126,6 @@ static int sorted_history_comparison(LinphoneChatRoom *to_insert, LinphoneChatRo
 		} else if (![self selectFirstRow]) {
 			ChatConversationCreateView *view = VIEW(ChatConversationCreateView);
 			view.tableController.notFirstTime = FALSE;
-			view.isForVoipConference = FALSE;
 			[PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
 		}
 	}
diff --git a/Classes/ChatsListView.m b/Classes/ChatsListView.m
index 5b0c21f7a..e80421b5f 100644
--- a/Classes/ChatsListView.m
+++ b/Classes/ChatsListView.m
@@ -120,7 +120,6 @@ static UICompositeViewDescription *compositeDescription = nil;
     view.isForEditing = false;
     view.isGroupChat = isGroup;
     view.tableController.notFirstTime = FALSE;
-	view.isForVoipConference = FALSE;
     [view.tableController.contactsGroup removeAllObjects];
     [PhoneMainView.instance changeCurrentView:view.compositeViewDescription];
 }
diff --git a/Classes/Conference/data/Duration.swift b/Classes/Conference/data/Duration.swift
deleted file mode 100644
index 46e7954ef..000000000
--- a/Classes/Conference/data/Duration.swift
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-import Foundation
-
-struct Duration : Comparable {
-	static func < (lhs: Duration, rhs: Duration) -> Bool {
-		return lhs.value < rhs.value
-	}
-	
-	let value: Int
-	let display: String
-}
diff --git a/Classes/Conference/data/ScheduledConferenceData.swift b/Classes/Conference/data/ScheduledConferenceData.swift
deleted file mode 100644
index 58b2019d0..000000000
--- a/Classes/Conference/data/ScheduledConferenceData.swift
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import Foundation
-import linphonesw
-
-
-class ScheduledConferenceData {
-	
-	let conferenceInfo: ConferenceInfo
-    let expanded = MutableLiveData<Bool>()
-
-    let address = MutableLiveData<String>()
-    let subject = MutableLiveData<String>()
-    let description = MutableLiveData<String>()
-    let time = MutableLiveData<String>()
-    let date = MutableLiveData<String>()
-    let duration = MutableLiveData<String>()
-    let organizer = MutableLiveData<String>()
-    let participantsShort = MutableLiveData<String>()
-    let participantsExpanded = MutableLiveData<String>()
-	
-
-    init (conferenceInfo: ConferenceInfo) {
-		self.conferenceInfo = conferenceInfo
-        expanded.value = false
-
-        address.value = conferenceInfo.uri?.asStringUriOnly()
-        subject.value = conferenceInfo.subject
-        description.value = conferenceInfo.description
-
-		time.value = TimestampUtils.timeToString(unixTimestamp: Double(conferenceInfo.dateTime))
-		date.value = TimestampUtils.toString(unixTimestamp:Double(conferenceInfo.dateTime), onlyDate:true, shortDate:false)
-
-		let durationFormatter = DateComponentsFormatter()
-		durationFormatter.unitsStyle = .positional
-		durationFormatter.allowedUnits = [.minute, .second ]
-		durationFormatter.zeroFormattingBehavior = [ .pad ]
-		duration.value = durationFormatter.string(from: TimeInterval(conferenceInfo.duration))
-		
-		organizer.value = conferenceInfo.organizer?.addressBookEnhancedDisplayName()
-		
-        computeParticipantsLists()
-    }
-
-    func destroy() {
-    }
-
-    func toggleExpand() {
-        expanded.value = expanded.value == false
-    }
-
-    private func computeParticipantsLists() {
-		participantsShort.value = conferenceInfo.participants.map {(participant) in
-			String(describing: participant.addressBookEnhancedDisplayName())
-		}.joined(separator: ", ")
-		
-		participantsExpanded.value = conferenceInfo.participants.map {(participant) in
-			String(describing: participant.addressBookEnhancedDisplayName())+" ("+String(describing: participant.asStringUriOnly())+")"
-		}.joined(separator: "\n")
-    }
-}
diff --git a/Classes/Conference/data/TimeZoneData.swift b/Classes/Conference/data/TimeZoneData.swift
deleted file mode 100644
index 0cbd3a0ae..000000000
--- a/Classes/Conference/data/TimeZoneData.swift
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import Foundation
-import linphonesw
-
-
-struct TimeZoneData : Comparable {
-	let timeZone: TimeZone
-
-	static func == (lhs: TimeZoneData, rhs: TimeZoneData) -> Bool {
-		return lhs.timeZone.identifier == rhs.timeZone.identifier
-	}
-	
-	static func < (lhs: TimeZoneData, rhs: TimeZoneData) -> Bool {
-		return lhs.timeZone.secondsFromGMT() < rhs.timeZone.secondsFromGMT()
-
-	}
-	
-	func descWithOffset() -> String {
-		return "\(timeZone.identifier) - GMT\(timeZone.offsetInHours())"
-	}
-}
-
-extension TimeZone {
-
-	func offsetFromUTC() -> String
-	{
-		let localTimeZoneFormatter = DateFormatter()
-		localTimeZoneFormatter.timeZone = self
-		localTimeZoneFormatter.dateFormat = "Z"
-		return localTimeZoneFormatter.string(from: Date())
-	}
-
-	func offsetInHours() -> String
-	{
-	
-		let hours = secondsFromGMT()/3600
-		let minutes = abs(secondsFromGMT()/60) % 60
-		let tz_hr = String(format: "%+.2d:%.2d", hours, minutes) // "+hh:mm"
-		return tz_hr
-	}
-}
diff --git a/Classes/Conference/viewmodels/ConferenceSchedulingViewModel.swift b/Classes/Conference/viewmodels/ConferenceSchedulingViewModel.swift
deleted file mode 100644
index d373f0673..000000000
--- a/Classes/Conference/viewmodels/ConferenceSchedulingViewModel.swift
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) 2010-2021 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * aDouble with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-import Foundation
-import linphonesw
-
-
-class ConferenceSchedulingViewModel  {
-	
-	let core = Core.get()
-	static let shared = ConferenceSchedulingViewModel()
-	
-	let subject = MutableLiveData<String>()
-	let description = MutableLiveData<String>()
-	
-	let scheduleForLater = MutableLiveData<Bool>()
-	let scheduledDate = MutableLiveData<Date>()
-	let scheduledTime = MutableLiveData<Date>()
-	
-	var scheduledTimeZone = MutableLiveData<Int>()
-	static let timeZones: [TimeZoneData] = computeTimeZonesList()
-	
-	var scheduledDuration = MutableLiveData<Int>()
-	static let durationList: [Duration] = computeDurationList()
-	
-	let isEncrypted = MutableLiveData<Bool>()
-	
-	let sendInviteViaChat = MutableLiveData<Bool>()
-	let sendInviteViaEmail = MutableLiveData<Bool>()
-		
-	let address = MutableLiveData<Address>()
-	
-	let conferenceCreationInProgress = MutableLiveData<Bool>()
-	
-	let conferenceCreationCompletedEvent: MutableLiveData<Bool> = MediatorLiveData()
-	let onErrorEvent = MutableLiveData<String>()
-	
-	let continueEnabled: MediatorLiveData<Bool> = MediatorLiveData()
-	
-	let selectedAddresses = MutableLiveData<[Address]>([])
-	
-	
-	private var hour: Int = 0
-	private var minutes: Int = 0
-	
-	private var coreDelegate : CoreDelegateStub? = nil
-	private var chatRooomDelegate : ChatRoomDelegate? = nil
-	
-	
-	init () {
-		coreDelegate = CoreDelegateStub(
-			onConferenceStateChanged : { (core: Core, conference: Conference, state: Conference.State?) -> Void in
-				Log.i("[Conference Creation] Conference state changed: \(state)")
-				if (state == .CreationPending) {
-					Log.i("[Conference Creation] Conference address will be \(conference.conferenceAddress?.asStringUriOnly())")
-					self.address.value = conference.conferenceAddress
-					
-					if (self.scheduleForLater.value == true) {
-						self.sendConferenceInfo()
-					} else {
-						self.conferenceCreationInProgress.value = false
-						self.conferenceCreationCompletedEvent.value = true
-					}
-				}
-			},
-			onConferenceInfoOnSent : { (core: Core, conferenceInfo:ConferenceInfo) -> Void in
-				Log.i("[Conference Creation] Conference information successfully sent to all participants")
-				self.conferenceCreationInProgress.value = false
-				self.conferenceCreationCompletedEvent.value = true
-			},
-			onConferenceInfoOnParticipantError : { (core: Core, conferenceInfo: ConferenceInfo, participant: Address, error: ConferenceInfoError?) -> Void in
-				Log.e("[Conference Creation] Conference information wasn't sent to participant \(participant.asStringUriOnly())")
-				self.onErrorEvent.value = VoipTexts.conference_schedule_info_not_sent_to_participant
-				self.conferenceCreationInProgress.value = false
-			}
-		)
-		Core.get().addDelegate(delegate: coreDelegate!)
-		
-		chatRooomDelegate = ChatRoomDelegateStub(
-			onStateChanged : { (room: ChatRoom, state: ChatRoom.State) -> Void in
-				if (state == ChatRoom.State.Created) {
-					Log.i("[Conference Creation] Chat room created")
-					room.removeDelegate(delegate: self.chatRooomDelegate!)
-				} else if (state == ChatRoom.State.CreationFailed) {
-					Log.e("[Conference Creation] Group chat room creation has failed !")
-					room.removeDelegate(delegate: self.chatRooomDelegate!)
-				}
-			}
-		)
-		
-		reset()
-		
-		subject.observe { _ in
-			self.continueEnabled.value = self.allMandatoryFieldsFilled()
-		}
-		scheduleForLater.observe { _ in
-			self.continueEnabled.value = self.allMandatoryFieldsFilled()
-		}
-		scheduledDate.observe { _ in
-			self.continueEnabled.value = self.allMandatoryFieldsFilled()
-		}
-		scheduledTime.observe { _ in
-			self.continueEnabled.value = self.allMandatoryFieldsFilled()
-		}
-		
-		
-	}
-	
-	func reset() {
-		
-		subject.value = ""
-		scheduleForLater.value = false
-		isEncrypted.value = false
-		sendInviteViaChat.value = true
-		sendInviteViaEmail.value = false
-		let now = Date()
-		scheduledTime.value = Calendar.current.date(from: Calendar.current.dateComponents([.hour, .minute, .second], from: now))
-		scheduledDate.value = Calendar.current.date(from: Calendar.current.dateComponents([.year, .month, .day], from: now))
-
-		scheduledTimeZone.value = ConferenceSchedulingViewModel.timeZones.indices.filter {
-			ConferenceSchedulingViewModel.timeZones[$0].timeZone.identifier == NSTimeZone.default.identifier
-		}.first
-		
-		scheduledDuration.value = ConferenceSchedulingViewModel.durationList.indices.filter {
-			ConferenceSchedulingViewModel.durationList[$0].value == 60
-		}.first
-		
-		continueEnabled.value = false
-	}
-	
-	
-	
-	func destroy() {
-		core.removeDelegate(delegate: coreDelegate!)
-	}
-	
-	
-	
-	func createConference() {
-		
-		if (selectedAddresses.value?.count == 0) {
-			Log.e("[Conference Creation] Couldn't create conference without any participant!")
-			return
-		}
-		
-		do {
-			conferenceCreationInProgress.value = true
-			let localAddress = core.defaultAccount?.params?.identityAddress
-			
-			// TODO: Temporary workaround for chat room, to be removed once we can get matching chat room from conference
-			let chatRoomParams = try core.createDefaultChatRoomParams()
-			chatRoomParams.backend = ChatRoomBackend.FlexisipChat
-			chatRoomParams.groupEnabled = true
-			chatRoomParams.subject = subject.value!
-			let chatRoom = try core.createChatRoom(params: chatRoomParams, localAddr: localAddress, participants: selectedAddresses.value!)
-			Log.i("[Conference Creation] Creating chat room with same subject [\(subject.value)] & participants as for conference")
-			chatRoom.addDelegate(delegate: chatRooomDelegate!)
-			let params = try core.createConferenceParams()
-			params.videoEnabled = true // TODO: Keep this to true ?
-			params.subject = subject.value!
-			let startTime = getConferenceStartTimestamp()
-			params.startTime = time_t(startTime)
-			
-			scheduledDuration.value.map {
-				params.endTime = params.startTime + $0
-			}
-			try core.createConferenceOnServer(params: params, localAddr: localAddress, participants: selectedAddresses.value!)
-		} catch {
-			Log.e("[Conference Creation] Failed \(error)")
-		}
-	}
-	
-	
-	
-	private func allMandatoryFieldsFilled() -> Bool {
-		return subject.value != nil && subject.value!.count > 0 && (scheduleForLater.value != true || (scheduledDate.value != nil && scheduledTime.value != nil));
-	}
-	
-	private func sendConferenceInfo() {
-		let participants :[Address] = []
-		
-		do {
-			let conferenceInfo = try Factory.Instance.createConferenceInfo()
-			conferenceInfo.uri = try Factory.Instance.createAddress(addr: "sip:video-conference-0@sip.linphone.org") // TODO: use address.value
-			conferenceInfo.participants = participants
-			conferenceInfo.organizer = core.defaultAccount?.params?.identityAddress
-			subject.value.map { conferenceInfo.subject = $0}
-			description.value.map { conferenceInfo.description = $0}
-			scheduledDuration.value.map {conferenceInfo.duration = $0 }
-			let timestamp = getConferenceStartTimestamp()
-			conferenceInfo.dateTime = time_t(timestamp)
-			
-			Log.i("[Conference Creation] Conference date & time set to ${TimestampUtils.dateToString(timestamp)} ${TimestampUtils.timeToString(timestamp)}, duration = ${conferenceInfo.duration}")
-			core.sendConferenceInformation(conferenceInformation: conferenceInfo, text: "")
-			
-			conferenceCreationInProgress.value = false
-			conferenceCreationCompletedEvent.value = true
-		} catch {
-			Log.e("[Conference Creation] unable to create conference \(error)")
-		}
-	}
-	
-	private func getConferenceStartTimestamp() -> Double {
-		return scheduleForLater.value == true ? scheduledDate.value!.timeIntervalSince1970 + scheduledTime.value!.timeIntervalSince1970 : Date().timeIntervalSince1970
-		
-	}
-	
-	
-	private static func computeTimeZonesList() -> [TimeZoneData] {
-		return TimeZone.knownTimeZoneIdentifiers.map {
-			(ident) in TimeZoneData(timeZone:TimeZone(identifier:ident)!)
-		}.sorted()
-	}
-	
-	private static func computeDurationList() -> [Duration] {
-		return [Duration(value: 30, display: "30min"), Duration(value: 60, display: "1h"), Duration(value: 120, display: "2h")]
-	}
-	
-	
-}
diff --git a/Classes/Conference/views/ConferenceSchedulingSummaryView.swift b/Classes/Conference/views/ConferenceSchedulingSummaryView.swift
deleted file mode 100644
index 2d809e857..000000000
--- a/Classes/Conference/views/ConferenceSchedulingSummaryView.swift
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-iphone
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-import UIKit
-import Foundation
-import linphonesw
-
-@objc class ConferenceSchedulingSummaryView:  NavigationView, UICompositeViewDelegate, UITableViewDataSource {
-	
-	let viewModel = ConferenceSchedulingViewModel.shared
-	let participantsListTableView = UITableView()
-
-	static let compositeDescription = UICompositeViewDescription(ConferenceSchedulingSummaryView.self, statusBar: StatusBarView.self, tabBar: nil, sideMenu: SideMenuView.self, fullscreen: false, isLeftFragment: false,fragmentWith: nil)
-	static func compositeViewDescription() -> UICompositeViewDescription! { return compositeDescription }
-	func compositeViewDescription() -> UICompositeViewDescription! { return type(of: self).compositeDescription }
-	
-	override func viewDidLoad() {
-		
-		super.viewDidLoad(
-			backAction: {
-				self.goBackParticipantsListSelection()
-			},nextAction: {
-			},
-			nextActionEnableCondition: viewModel.continueEnabled,
-			title:VoipTexts.conference_schedule_summary)
-		super.nextButton.isHidden = true
-	
-		let subjectLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_subject_title)
-		contentView.addSubview(subjectLabel)
-		subjectLabel.alignParentLeft(withMargin: form_margin).alignParentTop().done()
-		
-		let encryptedIcon = UIImageView(image: UIImage(named: "security_2_indicator"))
-		encryptedIcon.contentMode = .scaleAspectFit
-		contentView.addSubview(encryptedIcon)
-		encryptedIcon.height(form_input_height).alignParentTop().alignParentTop().alignParentRight(withMargin: form_margin).alignHorizontalCenterWith(subjectLabel).done()
-		viewModel.isEncrypted.readCurrentAndObserve { (encrypt) in
-			encryptedIcon.isHidden = encrypt != true
-		}
-		
-		
-		let subjectInput = StyledTextView(VoipTheme.conference_scheduling_font, placeHolder:VoipTexts.conference_schedule_subject_hint, liveValue: viewModel.subject, readOnly:true)
-		contentView.addSubview(subjectInput)
-		subjectInput.alignUnder(view: subjectLabel,withMargin: form_margin).matchParentSideBorders(insetedByDx: form_margin).height(form_input_height).done()
-	
-		
-		let schedulingStack = UIStackView()
-		schedulingStack.axis = .vertical
-		contentView.addSubview(schedulingStack)
-		schedulingStack.alignUnder(view: subjectInput,withMargin: 3*form_margin).matchParentSideBorders(insetedByDx: form_margin).done()
-		
-
-		let scheduleForm = UIView()
-		schedulingStack.addArrangedSubview(scheduleForm)
-		scheduleForm.matchParentSideBorders().done()
-		viewModel.scheduleForLater.readCurrentAndObserve { (forLater) in scheduleForm.isHidden = forLater != true }
-		
-		// Left column (Date & Time)
-		let leftColumn = UIView()
-		scheduleForm.addSubview(leftColumn)
-		leftColumn.matchParentWidthDividedBy(2.2).alignParentLeft(withMargin: form_margin).alignParentTop(withMargin: form_margin).done()
-		
-		let dateLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_date)
-		leftColumn.addSubview(dateLabel)
-		dateLabel.alignParentLeft().alignParentTop(withMargin: form_margin).done()
-		
-		let datePicker = StyledDatePicker(liveValue: viewModel.scheduledDate,pickerMode: .date, readOnly:true)
-		leftColumn.addSubview(datePicker)
-		datePicker.alignParentLeft().alignUnder(view: dateLabel,withMargin: form_margin).matchParentSideBorders().done()
-		
-		let timeLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_time)
-		leftColumn.addSubview(timeLabel)
-		timeLabel.alignParentLeft().alignUnder(view: datePicker,withMargin: form_margin).done()
-		
-		let timePicker = StyledDatePicker(liveValue: viewModel.scheduledTime,pickerMode: .time, readOnly:true)
-		leftColumn.addSubview(timePicker)
-		timePicker.alignParentLeft().alignUnder(view: timeLabel,withMargin: form_margin).matchParentSideBorders().done()
-	
-		leftColumn.wrapContentY().done()
-
-		
-		// Right column (Duration & Timezone)
-		let rightColumn = UIView()
-		scheduleForm.addSubview(rightColumn)
-		rightColumn.matchParentWidthDividedBy(2.2).alignParentRight(withMargin: form_margin).alignParentTop().done()
-		
-		let durationLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_duration)
-		rightColumn.addSubview(durationLabel)
-		durationLabel.alignParentLeft().alignParentTop(withMargin: form_margin).done()
-		
-		let durationValue = StyledValuePicker(liveIndex: viewModel.scheduledDuration,options: ConferenceSchedulingViewModel.durationList.map({ (duration: Duration) -> String in duration.display}), readOnly:true)
-		rightColumn.addSubview(durationValue)
-		durationValue.alignParentLeft().alignUnder(view: durationLabel,withMargin: form_margin).matchParentSideBorders().done()
-		
-		let timeZoneLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_timezone)
-		rightColumn.addSubview(timeZoneLabel)
-		timeZoneLabel.alignParentLeft().alignUnder(view: durationValue,withMargin: form_margin).done()
-		
-		let timeZoneValue = StyledValuePicker(liveIndex: viewModel.scheduledTimeZone,options: ConferenceSchedulingViewModel.timeZones.map({ (tzd: TimeZoneData) -> String in tzd.descWithOffset()}), readOnly:true)
-		rightColumn.addSubview(timeZoneValue)
-		timeZoneValue.alignParentLeft().alignUnder(view: timeZoneLabel,withMargin: form_margin).matchParentSideBorders().done()
-	
-		rightColumn.wrapContentY().done()
-		
-		// Description
-		let descriptionLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_description_title)
-		scheduleForm.addSubview(descriptionLabel)
-		descriptionLabel.alignUnder(view: leftColumn,withMargin: form_margin).alignUnder(view: rightColumn,withMargin: form_margin).matchParentSideBorders(insetedByDx: form_margin).done()
-		
-		let descriptionInput = StyledTextView(VoipTheme.conference_scheduling_font, placeHolder:VoipTexts.conference_schedule_description_hint,liveValue: viewModel.description, readOnly:true)
-		descriptionInput.textContainer.maximumNumberOfLines = 5
-		descriptionInput.textContainer.lineBreakMode = .byWordWrapping
-		scheduleForm.addSubview(descriptionInput)
-		descriptionInput.alignUnder(view: descriptionLabel,withMargin: form_margin).matchParentSideBorders(insetedByDx: form_margin).height(description_height).alignParentBottom(withMargin: form_margin*2).done()
-
-		scheduleForm.wrapContentY().done()
-		
-		// Sending method
-		let viaChatLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_send_invite_chat_summary)
-		contentView.addSubview(viaChatLabel)
-		viaChatLabel.matchParentSideBorders(insetedByDx: form_margin).alignUnder(view: schedulingStack,withMargin: 2*form_margin).done()
-		viewModel.sendInviteViaChat.readCurrentAndObserve { (sendChat) in
-			viaChatLabel.isHidden = sendChat != true
-		}
-			
-		// Participants
-		let participantsLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_participants_list)
-		participantsLabel.backgroundColor = VoipTheme.voipFormBackgroundColor.get()
-		contentView.addSubview(participantsLabel)
-		participantsLabel.matchParentSideBorders().height(form_input_height).alignUnder(view: viaChatLabel,withMargin: form_margin*2).done()
-		participantsLabel.textAlignment = .center
-		
-		
-		contentView.addSubview(participantsListTableView)
-		participantsListTableView.isScrollEnabled = false
-		participantsListTableView.dataSource = self
-		participantsListTableView.register(VoipParticipantCell.self, forCellReuseIdentifier: "VoipParticipantCellSSchedule")
-		participantsListTableView.allowsSelection = false
-		if #available(iOS 15.0, *) {
-			participantsListTableView.allowsFocus = false
-		}
-		participantsListTableView.separatorStyle = .singleLine
-		participantsListTableView.separatorColor = VoipTheme.light_grey_color
-		
-		viewModel.selectedAddresses.readCurrentAndObserve { (addresses) in
-			self.participantsListTableView.reloadData()
-			self.participantsListTableView.removeConstraints().done()
-			self.participantsListTableView.matchParentSideBorders().alignUnder(view: participantsLabel,withMargin: self.form_margin).done()
-			self.participantsListTableView.height(Double(addresses!.count) * VoipParticipantCell.cell_height).done()
-		}
-		
-		// Create / Schedule
-		let createButton = FormButton()
-		contentView.addSubview(createButton)
-		createButton.onClick {
-			self.viewModel.createConference()
-		}
-		viewModel.scheduleForLater.readCurrentAndObserve { _ in
-			createButton.title = self.viewModel.scheduleForLater.value == true ? VoipTexts.conference_schedule.uppercased() : VoipTexts.conference_schedule_create.uppercased()
-		}
-		createButton.centerX().alignParentBottom(withMargin: 3*self.form_margin).alignUnder(view: participantsListTableView,withMargin: 3*self.form_margin).done()
-		
-	}
-		
-	
-	
-	func goBackParticipantsListSelection() {
-		let view: ChatConversationCreateView = VIEW(ChatConversationCreateView.compositeViewDescription())
-		let addresses =  viewModel.selectedAddresses.value!.map { (address) in String(address.asStringUriOnly()) }
-		view.tableController.contactsGroup = (addresses as NSArray).mutableCopy() as? NSMutableArray
-		view.tableController.notFirstTime = true
-		view.isForEditing = false
-		view.isForVoipConference = true
-		PhoneMainView.instance().pop(toView: view.compositeViewDescription())
-	}
-	
-	// Objc - bridge, as can't access easily to the view model.
-	@objc func setParticipants(addresses:[String]) {
-		viewModel.selectedAddresses.value = []
-		return addresses.forEach { (address) in
-			if let address = try?Factory.Instance.createAddress(addr: address) {
-				viewModel.selectedAddresses.value?.append(address)
-			}
-		}
-	}
-	
-	// TableView datasource delegate
-	func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-		guard let participants = viewModel.selectedAddresses.value else {
-			return 0
-		}
-		return participants.count
-	}
-	
-	func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-		let cell:VoipParticipantCell = tableView.dequeueReusableCell(withIdentifier: "VoipParticipantCellSSchedule") as! VoipParticipantCell
-		guard let participant = viewModel.selectedAddresses.value?[indexPath.row] else {
-			return cell
-		}
-		cell.selectionStyle = .none
-		cell.scheduleConfParticipantAddress = participant
-		cell.limeBadge.isHidden = viewModel.isEncrypted.value != true
-		return cell
-	}
-	
-	
-}
diff --git a/Classes/Conference/views/ConferenceSchedulingView.swift b/Classes/Conference/views/ConferenceSchedulingView.swift
deleted file mode 100644
index a471138f8..000000000
--- a/Classes/Conference/views/ConferenceSchedulingView.swift
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-iphone
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-import UIKit
-import Foundation
-import linphonesw
-
-@objc class ConferenceSchedulingView:  NavigationView, UICompositeViewDelegate {
-	
-	let viewModel = ConferenceSchedulingViewModel.shared
-	
-	static let compositeDescription = UICompositeViewDescription(ConferenceSchedulingView.self, statusBar: StatusBarView.self, tabBar: nil, sideMenu: SideMenuView.self, fullscreen: false, isLeftFragment: false,fragmentWith: nil)
-	static func compositeViewDescription() -> UICompositeViewDescription! { return compositeDescription }
-	func compositeViewDescription() -> UICompositeViewDescription! { return type(of: self).compositeDescription }
-	
-	override func viewDidLoad() {
-		
-		super.viewDidLoad(
-			backAction: {
-				PhoneMainView.instance().popView(self.compositeViewDescription())
-			},nextAction: {
-				self.gotoParticipantsListSelection()
-			},
-			nextActionEnableCondition: viewModel.continueEnabled,
-			title:VoipTexts.conference_schedule_title)
-	
-		let subjectLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_subject_title)
-		subjectLabel.addIndicatorIcon(iconName: "voip_mandatory")
-		contentView.addSubview(subjectLabel)
-		subjectLabel.alignParentLeft(withMargin: form_margin).alignParentTop().done()
-		
-		let subjectInput = StyledTextView(VoipTheme.conference_scheduling_font, placeHolder:VoipTexts.conference_schedule_subject_hint, liveValue: viewModel.subject)
-		contentView.addSubview(subjectInput)
-		subjectInput.alignUnder(view: subjectLabel,withMargin: form_margin).matchParentSideBorders(insetedByDx: form_margin).height(form_input_height).done()
-		
-		
-		let schedulingStack = UIStackView()
-		schedulingStack.axis = .vertical
-		schedulingStack.backgroundColor = VoipTheme.voipFormBackgroundColor.get()
-		contentView.addSubview(schedulingStack)
-		schedulingStack.alignUnder(view: subjectInput,withMargin: form_margin).matchParentSideBorders(insetedByDx: form_margin).done()
-		
-		let scheduleForLater = UIView()
-		schedulingStack.addArrangedSubview(scheduleForLater)
-		scheduleForLater.matchParentSideBorders().height(schdule_for_later_height).done()
-
-		let laterSwitch = StyledSwitch(liveValue: viewModel.scheduleForLater)
-		scheduleForLater.addSubview(laterSwitch)
-		laterSwitch.alignParentTop(withMargin: form_margin*2.5).alignParentLeft(withMargin: form_margin).centerY().done()
-		
-		let laterLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_later)
-		laterLabel.numberOfLines = 2
-		scheduleForLater.addSubview(laterLabel)
-		laterLabel.alignParentTop(withMargin: form_margin*2).toRightOf(laterSwitch, withLeftMargin: form_margin*2).alignParentRight(withMargin: form_margin).done()
-
-		let scheduleForm = UIView()
-		schedulingStack.addArrangedSubview(scheduleForm)
-		scheduleForm.matchParentSideBorders().done()
-		viewModel.scheduleForLater.readCurrentAndObserve { (forLater) in scheduleForm.isHidden = forLater != true }
-		
-		// Left column (Date & Time)
-		let leftColumn = UIView()
-		scheduleForm.addSubview(leftColumn)
-		leftColumn.matchParentWidthDividedBy(2.2).alignParentLeft(withMargin: form_margin).alignParentTop(withMargin: form_margin).done()
-		
-		let dateLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_date)
-		dateLabel.addIndicatorIcon(iconName: "voip_mandatory")
-		leftColumn.addSubview(dateLabel)
-		dateLabel.alignParentLeft().alignParentTop(withMargin: form_margin).done()
-		
-		let datePicker = StyledDatePicker(liveValue: viewModel.scheduledDate,pickerMode: .date)
-		leftColumn.addSubview(datePicker)
-		datePicker.alignParentLeft().alignUnder(view: dateLabel,withMargin: form_margin).matchParentSideBorders().done()
-		
-		let timeLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_time)
-		timeLabel.addIndicatorIcon(iconName: "voip_mandatory")
-		leftColumn.addSubview(timeLabel)
-		timeLabel.alignParentLeft().alignUnder(view: datePicker,withMargin: form_margin).done()
-		
-		let timePicker = StyledDatePicker(liveValue: viewModel.scheduledTime,pickerMode: .time)
-		leftColumn.addSubview(timePicker)
-		timePicker.alignParentLeft().alignUnder(view: timeLabel,withMargin: form_margin).matchParentSideBorders().done()
-	
-		leftColumn.wrapContentY().done()
-
-		
-		// Right column (Duration & Timezone)
-		let rightColumn = UIView()
-		scheduleForm.addSubview(rightColumn)
-		rightColumn.matchParentWidthDividedBy(2.2).alignParentRight(withMargin: form_margin).alignParentTop().done()
-		
-		let durationLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_duration)
-		rightColumn.addSubview(durationLabel)
-		durationLabel.alignParentLeft().alignParentTop(withMargin: form_margin).done()
-		
-		let durationValue = StyledValuePicker(liveIndex: viewModel.scheduledDuration,options: ConferenceSchedulingViewModel.durationList.map({ (duration: Duration) -> String in duration.display}))
-		rightColumn.addSubview(durationValue)
-		durationValue.alignParentLeft().alignUnder(view: durationLabel,withMargin: form_margin).matchParentSideBorders().done()
-		
-		let timeZoneLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_timezone)
-		rightColumn.addSubview(timeZoneLabel)
-		timeZoneLabel.alignParentLeft().alignUnder(view: durationValue,withMargin: form_margin).done()
-		
-		let timeZoneValue = StyledValuePicker(liveIndex: viewModel.scheduledTimeZone,options: ConferenceSchedulingViewModel.timeZones.map({ (tzd: TimeZoneData) -> String in tzd.descWithOffset()}))
-		rightColumn.addSubview(timeZoneValue)
-		timeZoneValue.alignParentLeft().alignUnder(view: timeZoneLabel,withMargin: form_margin).matchParentSideBorders().done()
-	
-		rightColumn.wrapContentY().done()
-		
-		// Description
-		let descriptionLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_description_title)
-		scheduleForm.addSubview(descriptionLabel)
-		descriptionLabel.alignUnder(view: leftColumn,withMargin: form_margin).alignUnder(view: rightColumn,withMargin: form_margin).matchParentSideBorders(insetedByDx: form_margin).done()
-		
-		let descriptionInput = StyledTextView(VoipTheme.conference_scheduling_font, placeHolder:VoipTexts.conference_schedule_description_hint,liveValue: viewModel.description)
-		descriptionInput.textContainer.maximumNumberOfLines = 5
-		descriptionInput.textContainer.lineBreakMode = .byWordWrapping
-		scheduleForm.addSubview(descriptionInput)
-		descriptionInput.alignUnder(view: descriptionLabel,withMargin: form_margin).matchParentSideBorders(insetedByDx: form_margin).height(description_height).alignParentBottom(withMargin: form_margin*2).done()
-
-		scheduleForm.wrapContentY().done()
-		
-		// Sending methods
-		let viaChatSwitch = StyledCheckBox(liveValue: viewModel.sendInviteViaChat)
-		contentView.addSubview(viaChatSwitch)
-		viaChatSwitch.alignParentLeft(withMargin: form_margin).alignUnder(view: schedulingStack,withMargin: 2*form_margin).done()
-		
-		let viaChatLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_send_invite_chat)
-		contentView.addSubview(viaChatLabel)
-		viaChatLabel.toRightOf(viaChatSwitch,withLeftMargin: form_margin).alignUnder(view: schedulingStack,withMargin: 2*form_margin).alignHorizontalCenterWith(viaChatSwitch).done()
-		
-		let viaMailSwitch = StyledCheckBox(liveValue: viewModel.sendInviteViaEmail)
-		contentView.addSubview(viaMailSwitch)
-		viaMailSwitch.alignParentLeft(withMargin: form_margin).alignUnder(view: viaChatSwitch,withMargin: 2*form_margin).done()
-		
-		let viaMailLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_send_invite_email)
-		contentView.addSubview(viaMailLabel)
-		viaMailLabel.toRightOf(viaMailSwitch,withLeftMargin: form_margin).alignUnder(view: viaChatLabel,withMargin: 2*form_margin).alignHorizontalCenterWith(viaMailSwitch).done()
-
-		
-		// Encryption
-		let encryptLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_encryption)
-		contentView.addSubview(encryptLabel)
-		encryptLabel.alignUnder(view: viaMailLabel,withMargin: 4*form_margin).centerX().done()
-		
-		let encryptCombo = UIStackView()
-		contentView.addSubview(encryptCombo)
-		encryptCombo.alignUnder(view: encryptLabel,withMargin: form_margin).centerX().height(form_input_height).done()
-		
-		let unencryptedIcon = UIImageView(image: UIImage(named: "security_toggle_icon_grey"))
-		unencryptedIcon.contentMode = .scaleAspectFit
-		encryptCombo.addArrangedSubview(unencryptedIcon)
-
-		let encryptSwitch = StyledSwitch(liveValue: viewModel.isEncrypted)
-		encryptCombo.addArrangedSubview(encryptSwitch)
-		encryptSwitch.centerY().alignParentTop(withMargin: form_margin).done()
-		
-		let encryptedIcon = UIImageView(image: UIImage(named: "security_toggle_icon_green"))
-		encryptedIcon.contentMode = .scaleAspectFit
-		encryptCombo.addArrangedSubview(encryptedIcon)
-				
-		
-		// Mandatory label
-		
-		let mandatoryLabel = StyledLabel(VoipTheme.conference_scheduling_font, VoipTexts.conference_schedule_mandatory_field)
-		mandatoryLabel.addIndicatorIcon(iconName: "voip_mandatory", trailing: false)
-		contentView.addSubview(mandatoryLabel)
-		mandatoryLabel.alignUnder(view: encryptCombo,withMargin: 4*form_margin).centerX().matchParentSideBorders().done()
-		mandatoryLabel.textAlignment = .center
-		
-		mandatoryLabel.alignParentBottom().done()
-						
-	}
-	
-	func gotoParticipantsListSelection() {
-		let view: ChatConversationCreateView = self.VIEW(ChatConversationCreateView.compositeViewDescription());
-		let addresses =  viewModel.selectedAddresses.value!.map { (address) in String(address.asStringUriOnly()) }
-		view.tableController.contactsGroup = (addresses as NSArray).mutableCopy() as? NSMutableArray
-		view.isForEditing = false
-		view.isForVoipConference = true
-		view.tableController.notFirstTime = true
-		view.isGroupChat = true
-		PhoneMainView.instance().changeCurrentView(view.compositeViewDescription())
-	}
-	
-	@objc func resetViewModel() {
-		viewModel.reset()
-	}
-}
diff --git a/Classes/DialerView.h b/Classes/DialerView.h
index fb70ffa74..808900397 100644
--- a/Classes/DialerView.h
+++ b/Classes/DialerView.h
@@ -53,7 +53,7 @@
 @property(nonatomic, strong) IBOutlet UICamSwitch *videoCameraSwitch;
 @property(weak, nonatomic) IBOutlet UIView *padView;
 
-- (IBAction)onVoipConferenceCreateClick:(id)event;
+- (IBAction)onAddContactClick:(id)event;
 - (IBAction)onBackClick:(id)event;
 - (IBAction)onAddressChange:(id)sender;
 - (IBAction)onBackspaceClick:(id)sender;
diff --git a/Classes/DialerView.m b/Classes/DialerView.m
index be7029273..d24f91ee2 100644
--- a/Classes/DialerView.m
+++ b/Classes/DialerView.m
@@ -144,10 +144,6 @@ static UICompositeViewDescription *compositeDescription = nil;
 			[_videoCameraSwitch setHidden:FALSE];
 		}
 	}
-	
-	[_addContactButton setImage:[UIImage imageNamed:@"voip_conference_new"] forState:UIControlStateNormal];
-	_addContactButton.imageView.contentMode = UIViewContentModeScaleAspectFit;
-	_addContactButton.enabled = true;
 }
 
 - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
@@ -392,10 +388,13 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 #pragma mark - Action Functions
 
-- (IBAction)onVoipConferenceCreateClick:(id)event {
-	ConferenceSchedulingView *view = VIEW(ConferenceSchedulingView);
-	[view resetViewModel];
-	[PhoneMainView.instance changeCurrentView:ConferenceSchedulingView.compositeViewDescription];
+- (IBAction)onAddContactClick:(id)event {
+	[ContactSelection setSelectionMode:ContactSelectionModeEdit];
+	[ContactSelection setAddAddress:[_addressField text]];
+	[ContactSelection setSipFilter:nil];
+	[ContactSelection setNameOrEmailFilter:nil];
+	[ContactSelection enableEmailFilter:FALSE];
+	[PhoneMainView.instance changeCurrentView:ContactsListView.compositeViewDescription];
 }
 
 - (IBAction)onBackClick:(id)event {
@@ -406,6 +405,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	if ([self displayDebugPopup:_addressField.text]) {
 		_addressField.text = @"";
 	}
+	_addContactButton.enabled = _backspaceButton.enabled = ([[_addressField text] length] > 0);
     if ([_addressField.text length] == 0) {
         [self.view endEditing:YES];
     }
diff --git a/Classes/LinphoneUI/Base.lproj/UIChatCreateCell.xib b/Classes/LinphoneUI/Base.lproj/UIChatCreateCell.xib
index ebfd9fbee..b40e9419a 100644
--- a/Classes/LinphoneUI/Base.lproj/UIChatCreateCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIChatCreateCell.xib
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -38,7 +37,7 @@
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" fixedFrame="YES" image="check_selected.png" translatesAutoresizingMaskIntoConstraints="NO" id="qMd-eD-DOW" userLabel="selectedImage">
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" fixedFrame="YES" image="check_selected.png" translatesAutoresizingMaskIntoConstraints="NO" id="qMd-eD-DOW" userLabel="selectedImage">
                     <rect key="frame" x="347" y="21" width="21" height="22"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                 </imageView>
@@ -58,10 +57,10 @@
                 <view hidden="YES" alpha="0.65000000000000002" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="THU-mJ-O0r" userLabel="greyView">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                 </view>
             </subviews>
-            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
             <nil key="simulatedStatusBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <point key="canvasLocation" x="890.39999999999998" y="192.50374812593705"/>
@@ -72,8 +71,5 @@
         <image name="check_selected.png" width="75.199996948242188" height="51.200000762939453"/>
         <image name="linphone_user.png" width="41.599998474121094" height="42.400001525878906"/>
         <image name="security_toogle_icon_green.png" width="33.599998474121094" height="38.400001525878906"/>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
     </resources>
 </document>
diff --git a/Classes/LinphoneUI/StatusBarView.m b/Classes/LinphoneUI/StatusBarView.m
index 5f6b1d151..c291da827 100644
--- a/Classes/LinphoneUI/StatusBarView.m
+++ b/Classes/LinphoneUI/StatusBarView.m
@@ -77,8 +77,6 @@
 	[self accountUpdate:account];
 	[self updateUI:linphone_core_get_calls_nb(LC)];
 	[self updateVoicemail];
-	
-	_callQualityButton.userInteractionEnabled = false;
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
diff --git a/Classes/SwiftUtil/Extensions/IOS/OptionalExtensions.swift b/Classes/SwiftUtil/Extensions/IOS/OptionalExtensions.swift
index ddb0ad754..58f10f627 100644
--- a/Classes/SwiftUtil/Extensions/IOS/OptionalExtensions.swift
+++ b/Classes/SwiftUtil/Extensions/IOS/OptionalExtensions.swift
@@ -27,17 +27,6 @@ extension Optional {
 			return value
 		}
 	}
+	
+	
 }
-
-extension Optional: CustomStringConvertible {
-
-	public var description: String {
-		switch self {
-		case .some(let wrappedValue):
-			return "\(wrappedValue)"
-		default:
-			return "<nil>|⭕️"
-		}
-	}
-}
-
diff --git a/Classes/SwiftUtil/Extensions/IOS/UIButtonExtensions.swift b/Classes/SwiftUtil/Extensions/IOS/UIButtonExtensions.swift
deleted file mode 100644
index 2e7825594..000000000
--- a/Classes/SwiftUtil/Extensions/IOS/UIButtonExtensions.swift
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-iphone
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import Foundation
-import SnapKit
-import UIKit
-
-extension UIButton {
-	func addSidePadding(p:CGFloat = 10) {
-		if let w = titleLabel?.textWidth {
-			width(w+p).done()
-		}
-	}
-}
diff --git a/Classes/SwiftUtil/Extensions/IOS/UILabelExtensions.swift b/Classes/SwiftUtil/Extensions/IOS/UILabelExtensions.swift
deleted file mode 100644
index 6cf1b23ed..000000000
--- a/Classes/SwiftUtil/Extensions/IOS/UILabelExtensions.swift
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-iphone
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import Foundation
-import SnapKit
-import UIKit
-
-extension UILabel {
-	var textWidth: CGFloat? {
-		guard let myText = self.text else { return nil }
-		guard let myFont = self.font else { return  nil }
-		let rect = CGSize(width: CGFloat.greatestFiniteMagnitude, height: CGFloat.greatestFiniteMagnitude)
-		let labelSize = myText.boundingRect(with: rect, options: .usesLineFragmentOrigin, attributes: [NSAttributedString.Key.font: myFont], context: nil)
-		return ceil(labelSize.width)
-	}
-}
diff --git a/Classes/SwiftUtil/Extensions/IOS/UIVIewExtensions.swift b/Classes/SwiftUtil/Extensions/IOS/UIVIewExtensions.swift
index d557a2294..7e99f532f 100644
--- a/Classes/SwiftUtil/Extensions/IOS/UIVIewExtensions.swift
+++ b/Classes/SwiftUtil/Extensions/IOS/UIVIewExtensions.swift
@@ -30,7 +30,6 @@ extension UIView {
 		return self
 	}
 	
-	
 	func square(_ size:Int) -> UIView {
 		snp.makeConstraints { (make) in
 			make.width.equalTo(size)
@@ -92,13 +91,6 @@ extension UIView {
 		return self
 	}
 	
-	func matchBordersOf(view:UIView) -> UIView {
-		snp.makeConstraints { (make) in
-			make.left.right.equalTo(view)
-		}
-		return self
-	}
-	
 	func matchParentDimmensions() -> UIView {
 		snp.makeConstraints { (make) in
 			make.left.right.top.bottom.equalToSuperview()
@@ -106,13 +98,6 @@ extension UIView {
 		return self
 	}
 	
-	func matchParentEdges() -> UIView {
-		snp.makeConstraints { (make) in
-			make.edges.equalToSuperview()
-		}
-		return self
-	}
-	
 	func matchDimentionsOf(view:UIView) -> UIView {
 		snp.makeConstraints { (make) in
 			make.left.right.top.bottom.equalTo(view)
@@ -127,13 +112,6 @@ extension UIView {
 		return self
 	}
 	
-	func addRightMargin(margin:CGFloat) -> UIView {
-		snp.makeConstraints { (make) in
-			make.rightMargin.equalTo(margin)
-		}
-		return self
-	}
-	
 	func matchParentHeightDividedBy(_ divider : CGFloat) -> UIView {
 		snp.makeConstraints { (make) in
 			make.height.equalToSuperview().dividedBy(divider)
@@ -248,7 +226,7 @@ extension UIView {
 	func alignParentRight(withMargin:CGFloat) -> UIView {
 		return alignParentRight(withMargin:Int(withMargin))
 	}
-	
+
 	
 	func toRightOf(_ view:UIView, withLeftMargin:Int = 0) -> UIView {
 		snp.makeConstraints { (make) in
@@ -261,15 +239,6 @@ extension UIView {
 		return toRightOf(view,withLeftMargin: Int(withLeftMargin))
 	}
 	
-	
-	func alignHorizontalCenterWith(_ view:UIView) -> UIView {
-		snp.makeConstraints { (make) in
-			make.centerY.equalTo(view)
-		}
-		return self
-	}
-	
-	
 	func toLeftOf(_ view:UIView) -> UIView {
 		snp.makeConstraints { (make) in
 			make.right.equalTo(view.snp.left)
@@ -349,33 +318,9 @@ extension UIView {
 	@objc func handleTap(_ sender: TapGestureRecognizer) {
 		sender.action!()
 	}
-	
+		
 	func VIEW<T>( _ desc: UICompositeViewDescription) -> T{
 		return PhoneMainView.instance().mainViewController.getCachedController(desc.name) as! T
 	}
-	
-	// Theming
-	
-	func setFormInputBackground(readOnly:Bool) {
-		if (readOnly) {
-			backgroundColor = VoipTheme.voipFormDisabledFieldBackgroundColor.get()
-		} else {
-			layer.borderWidth = 1
-			layer.borderColor = VoipTheme.voipFormFieldBackgroundColor.get().cgColor
-		}
-		layer.cornerRadius = 3
-		clipsToBounds = true
-	}
-	
-	@objc func toImage() -> UIImage? {
-		UIGraphicsBeginImageContextWithOptions(bounds.size, false, 0)
-		guard let context = UIGraphicsGetCurrentContext() else { return nil }
-		context.saveGState()
-		layer.render(in: context)
-		context.restoreGState()
-		guard let image = UIGraphicsGetImageFromCurrentImageContext() else { return nil }
-		UIGraphicsEndImageContext()
-		return image
-	}
-	
+		
 }
diff --git a/Classes/SwiftUtil/GenericViews/NavigationView.swift b/Classes/SwiftUtil/GenericViews/NavigationView.swift
deleted file mode 100644
index a44bf3d89..000000000
--- a/Classes/SwiftUtil/GenericViews/NavigationView.swift
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-iphone
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-import UIKit
-import Foundation
-import linphonesw
-
-@objc class NavigationView:  UIViewController {
-	
-	
-	// layout constants
-	let top_bar_height = 60.0
-	let navigation_buttons_padding = 18.0
-	let content_margin_top = 20
-	
-	// User by subviews
-	let form_margin = 10.0
-	let form_input_height = 40.0
-	let schdule_for_later_height = 80.0
-	let description_height = 150.0
-	
-	
-	
-	let titleLabel = StyledLabel(VoipTheme.calls_list_header_font)
-	
-	let topBar = UIView()
-	let scrollView = UIScrollView()
-	let contentView = UIView()
-	var backAction : (() -> Void)? = nil
-	var nextAction : (() -> Void)? = nil
-	
-	let backButton = CallControlButton(buttonTheme:VoipTheme.nav_button("back_default"))
-	let nextButton = CallControlButton(buttonTheme:VoipTheme.nav_button("next_default"))
-	
-	func viewDidLoad(backAction : @escaping () -> Void,
-					 nextAction : @escaping () -> Void,
-					 nextActionEnableCondition: MutableLiveData<Bool>,
-					 title:String) {
-		self.backAction = backAction
-		self.nextAction = nextAction
-		
-		self.view.addSubview(topBar)
-		topBar.alignParentTop().height(top_bar_height).matchParentSideBorders().done()
-		
-		topBar.addSubview(backButton)
-		backButton.alignParentLeft().matchParentHeight().done()
-		backButton.onClickAction = backAction
-		
-		topBar.addSubview(nextButton)
-		nextButton.alignParentRight().matchParentHeight().done()
-		nextButton.onClickAction = nextAction
-		nextActionEnableCondition.readCurrentAndObserve { (enableNext) in
-			self.nextButton.isEnabled = enableNext == true
-		}
-
-		topBar.addSubview(titleLabel)
-		titleLabel.matchParentHeight().centerX().done()
-		titleLabel.text = title
-		
-		super.viewDidLoad()
-
-		view.addSubview(scrollView)
-		scrollView.alignUnder(view: topBar, withMargin: content_margin_top).alignParentBottom().matchParentSideBorders().done()
-		scrollView.addSubview(contentView)
-		contentView.matchBordersOf(view: view).alignParentBottom().alignParentTop().done() // don't forget a bottom constraint b/w last element of contentview and contentview
-			
-	}
-	
-	
-	override func viewWillAppear(_ animated: Bool) {
-		super.viewWillAppear(animated)
-		topBar.backgroundColor = VoipTheme.voipToolbarBackgroundColor.get()
-		
-	}
-	
-}
diff --git a/Classes/SwiftUtil/TimestampUtils.swift b/Classes/SwiftUtil/TimestampUtils.swift
deleted file mode 100644
index 64946c34c..000000000
--- a/Classes/SwiftUtil/TimestampUtils.swift
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class TimestampUtils {
-
-	static func is24Hour() -> Bool {
-		let dateFormat = DateFormatter.dateFormat(fromTemplate: "j", options: 0, locale: Locale.current)!
-		return dateFormat.firstIndex(of: "a") == nil
-	}
-	
-	static func timeToString(unixTimestamp: Double, timestampInSecs: Bool = true) -> String {
-		let date = Date(timeIntervalSince1970: unixTimestamp)
-		let dateFormat = DateFormatter()
-		dateFormat.dateFormat = is24Hour()  ? "HH'h'mm" : "h:mm a"
-		return dateFormat.string(from: date)
-	}
-	
-	static func toString(
-		unixTimestamp: Double,
-			   onlyDate: Bool = false,
-			   timestampInSecs: Bool = true,
-			   shortDate: Bool = true
-		   ) -> String {
-			   let date = Date(timeIntervalSince1970: unixTimestamp)
-			   let dateFormatter = DateFormatter()
-			   dateFormatter.dateStyle = onlyDate ? .none : .long
-			   dateFormatter.timeStyle = shortDate ? .short : .long
-			   dateFormatter.doesRelativeDateFormatting = true
-			   return dateFormatter.string(from: date)
-		   }
-	
-	static func dateToString(date:Date) -> String {
-		let dateFormatter = DateFormatter()
-		dateFormatter.dateStyle = .short
-		dateFormatter.timeStyle = .none
-		return dateFormatter.string(from: date)
-	}
-	
-	static func timeToString(date:Date) -> String {
-		let dateFormatter = DateFormatter()
-		dateFormatter.dateStyle = .none
-		dateFormatter.timeStyle = .short
-		return dateFormatter.string(from: date)
-	}
-	
-	
-}
-
diff --git a/Classes/SwiftUtil/ViewModel/MediatorLiveData.swift b/Classes/SwiftUtil/ViewModel/MediatorLiveData.swift
deleted file mode 100644
index f040df597..000000000
--- a/Classes/SwiftUtil/ViewModel/MediatorLiveData.swift
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 2010-2020 Belledonne Communications SARL.
-*
-* This file is part of linhome
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-import Foundation
-
-
-class MediatorLiveData<T> : MutableLiveData<T> {
-   
-	private var sources : [MutableLiveData<T>?] = []
-	
-	override init(_ initial:T) {
-		super.init(initial)
-	}
-	
-	override init () {
-		super.init()
-	}
-	
-	func addSource(_ source: MutableLiveData<T>, _ onSourceChange:@escaping ()->Void) {
-		sources.append(source)
-		source.observe(onChange: { _ in
-			onSourceChange()
-		})
-	}
-	
-	func destroy() {
-		sources.forEach { $0?.clearObservers() }
-		clearObservers()
-	}
-	
-}
diff --git a/Classes/Voip/Models/ControlsViewModel.swift b/Classes/Voip/Models/ControlsViewModel.swift
index 53029a73e..51109541e 100644
--- a/Classes/Voip/Models/ControlsViewModel.swift
+++ b/Classes/Voip/Models/ControlsViewModel.swift
@@ -121,7 +121,7 @@ class ControlsViewModel {
 
 	
 	private func shouldProximitySensorBeEnabled() -> Bool {
-		return core.callsNb > 0 && isVideoEnabled.value != true && nonEarpieceOutputAudioDevice.value != true
+		return isVideoEnabled.value != true && nonEarpieceOutputAudioDevice.value != true
 	}
 	
 
diff --git a/Classes/Voip/Theme/TextStyle.swift b/Classes/Voip/Theme/TextStyle.swift
index 66c6d45e1..ceff5a5eb 100644
--- a/Classes/Voip/Theme/TextStyle.swift
+++ b/Classes/Voip/Theme/TextStyle.swift
@@ -27,7 +27,7 @@ struct TextStyle {
 	var align:NSTextAlignment
 	var font:String
 	var size:Float
-	
+		
 	func boldEd() -> TextStyle {
 		return self.font.contains("Bold") ? self : TextStyle(fgColor: self.fgColor,bgColor: self.bgColor,allCaps: self.allCaps,align: self.align,font: self.font.replacingOccurrences(of: "Regular", with: "Bold"), size: self.size)
 	}
@@ -46,23 +46,6 @@ extension UILabel {
 		let fontSizeMultiplier: Float = (UIDevice.ipad() ? 1.25 : UIDevice.is5SorSEGen1() ? 0.9 : 1.0)
 		font = UIFont.init(name: style.font, size: CGFloat(style.size*fontSizeMultiplier))
 	}
-	
-	func addIndicatorIcon(iconName:String, _ padding:CGFloat = 5.0, trailing: Bool = true) {
-		let imageAttachment = NSTextAttachment()
-		imageAttachment.image = UIImage(named:iconName)
-		imageAttachment.bounds = CGRect(x: 5.0, y: 4.0, width: font.lineHeight - 2*padding, height: font.lineHeight - 2*padding)
-		let iconString = NSMutableAttributedString(attachment: imageAttachment)
-		let textXtring = NSMutableAttributedString(string: text != nil ? text! : "")
-		if (trailing) {
-			textXtring.append(iconString)
-			self.text = nil
-			self.attributedText = textXtring
-		} else {
-			iconString.append(textXtring)
-			self.text = nil
-			self.attributedText = iconString
-		}
-	}
 }
 
 extension UIButton {
@@ -76,18 +59,3 @@ extension UIButton {
 		contentHorizontalAlignment = style.align == .left ? .left : style.align == .center ? .center : style.align == .right ? .right : .left
 	}
 }
-
-extension UITextView {
-	func applyStyle(_ style:TextStyle) {
-		textColor = style.fgColor.get()
-		backgroundColor = style.bgColor.get()
-		if (style.allCaps) {
-			text = self.text?.uppercased()
-			tag = 1
-		}
-		textAlignment = style.align
-		let fontSizeMultiplier: Float = (UIDevice.ipad() ? 1.25 : UIDevice.is5SorSEGen1() ? 0.9 : 1.0)
-		font = UIFont.init(name: style.font, size: CGFloat(style.size*fontSizeMultiplier))
-	}
-}
-
diff --git a/Classes/Voip/Theme/VoipTexts.swift b/Classes/Voip/Theme/VoipTexts.swift
index b5c1e8f21..4df37ec4d 100644
--- a/Classes/Voip/Theme/VoipTexts.swift
+++ b/Classes/Voip/Theme/VoipTexts.swift
@@ -20,7 +20,7 @@
 import Foundation
 import UIKit
 
-@objc class VoipTexts : NSObject { // From android key names. Added intentionnally with NSLocalizedString calls for each key, so it can be picked up by translation system (Weblate or Xcode).
+class VoipTexts { // From android key names. Added intentionnally with NSLocalizedString calls for each key, so it can be picked up by translation system (Weblate or Xcode).
 	
 	static let appName = Bundle.main.object(forInfoDictionaryKey: "CFBundleDisplayName") as! String
 	
@@ -40,7 +40,7 @@ import UIKit
 	static let call_error_temporarily_unavailable = NSLocalizedString("Temporarily unavailable",comment:"")
 	static let call_error_generic = NSLocalizedString("Error: %s",comment:"")
 	static let call_video_update_requested_dialog = NSLocalizedString("Correspondent would like to turn the video on",comment:"")
-	@objc static let call_action_participants_list = NSLocalizedString("Participants list",comment:"")
+	static let call_action_participants_list = NSLocalizedString("Participants list",comment:"")
 	static let call_action_chat = NSLocalizedString("Chat",comment:"")
 	static let call_action_calls_list = NSLocalizedString("Calls list",comment:"")
 	static let call_action_numpad = NSLocalizedString("Numpad",comment:"")
diff --git a/Classes/Voip/Theme/VoipTheme.swift b/Classes/Voip/Theme/VoipTheme.swift
index c17d33e09..1a5d77d9d 100644
--- a/Classes/Voip/Theme/VoipTheme.swift
+++ b/Classes/Voip/Theme/VoipTheme.swift
@@ -114,10 +114,6 @@ class VoipTheme { // Names & values replicated from Android
 	static let conference_mode_title = TextStyle(fgColor: LightDarkColor(dark_grey_color,dark_grey_color), bgColor: LightDarkColor(.clear,.clear), allCaps: false, align: .left, font: fontName+"-Regular", size: 17.0)
 	static let conference_mode_title_selected = conference_mode_title.boldEd()
 
-	static let conference_scheduling_font = TextStyle(fgColor: voipTextColor, bgColor: LightDarkColor(.clear,.clear), allCaps: false, align: .left, font: fontName+"-Regular", size: 17.0)
-
-	
-	
 	
 	
 	// Buttons Background (State colors)
@@ -341,18 +337,6 @@ class VoipTheme { // Names & values replicated from Android
 		tintableStateIcons:[UIButton.State.normal.rawValue : TintableIcon(name: "voip_merge_calls",tintColor: LightDarkColor(.white,.white))],
 		backgroundStateColors: button_round_background)
 
-	// Navigation
-	
-	static func nav_button(_ iconName:String) -> ButtonTheme {
-		return ButtonTheme(
-		tintableStateIcons:[
-			UIButton.State.normal.rawValue : TintableIcon(name: iconName,tintColor: LightDarkColor(.darkGray,.white)),
-			UIButton.State.highlighted.rawValue : TintableIcon(name: iconName,tintColor: LightDarkColor(primary_color,primary_color)),
-			UIButton.State.disabled.rawValue : TintableIcon(name: iconName,tintColor: LightDarkColor(light_grey_color,light_grey_color)),
-		],
-		backgroundStateColors: [:])
-	}
-	
 }
 
 
diff --git a/Classes/Voip/Views/Fragments/AudioRoutesView.swift b/Classes/Voip/Views/Fragments/AudioRoutesView.swift
index ad5a02544..1618e3727 100644
--- a/Classes/Voip/Views/Fragments/AudioRoutesView.swift
+++ b/Classes/Voip/Views/Fragments/AudioRoutesView.swift
@@ -39,7 +39,6 @@ class AudioRoutesView: UIStackView {
 		// bluetooth
 		let blueTooth = CallControlButton(buttonTheme: VoipTheme.route_bluetooth, onClickAction: {
 			ControlsViewModel.shared.forceBluetoothAudioRoute()
-			ControlsViewModel.shared.audioRoutesSelected.value = false
 		})
 		addArrangedSubview(blueTooth)
 		
@@ -50,7 +49,6 @@ class AudioRoutesView: UIStackView {
 		// Earpiece
 		let earpiece = CallControlButton(buttonTheme: VoipTheme.route_earpiece, onClickAction: {
 			ControlsViewModel.shared.forceEarpieceAudioRoute()
-			ControlsViewModel.shared.audioRoutesSelected.value = false
 		})
 		addArrangedSubview(earpiece)
 		ControlsViewModel.shared.isSpeakerSelected.readCurrentAndObserve { (isSpeakerSelected) in
@@ -63,7 +61,6 @@ class AudioRoutesView: UIStackView {
 		// Speaker
 		let speaker = CallControlButton(buttonTheme: VoipTheme.route_speaker, onClickAction: {
 			ControlsViewModel.shared.forceSpeakerAudioRoute()
-			ControlsViewModel.shared.audioRoutesSelected.value = false
 		})
 		addArrangedSubview(speaker)
 		ControlsViewModel.shared.isSpeakerSelected.readCurrentAndObserve { (selected) in
diff --git a/Classes/Voip/Views/Fragments/ParticipantsList/VoipParticipantCell.swift b/Classes/Voip/Views/Fragments/ParticipantsList/VoipParticipantCell.swift
index e5befc446..c57a4e7a0 100644
--- a/Classes/Voip/Views/Fragments/ParticipantsList/VoipParticipantCell.swift
+++ b/Classes/Voip/Views/Fragments/ParticipantsList/VoipParticipantCell.swift
@@ -30,15 +30,12 @@ class VoipParticipantCell: UITableViewCell {
 	let dismiss_icon_inset = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
 	let dismiss_right_margin = 10
 	let check_box_size = 20.0
-	static let cell_height = 80.0
+	let cell_height = 80.0
 	let avatar_left_margin = 15.0
 	let texts_left_margin = 20.0
-	let lime_badge_width = 18.0
-	let lime_badge_offset = -10.0
 
 
 	let avatar = Avatar(diameter:VoipCallCell.avatar_size,color:VoipTheme.primaryTextColor, textStyle: VoipTheme.call_generated_avatar_small)
-	let limeBadge = UIImageView(image: UIImage(named: "security_toggle_icon_green"))
 	let displayName = StyledLabel(VoipTheme.conference_participant_name_font)
 	let sipAddress = StyledLabel(VoipTheme.conference_participant_sip_uri_font)
 	let isAdminView = UIView()
@@ -50,7 +47,6 @@ class VoipParticipantCell: UITableViewCell {
 	var participantData: ConferenceParticipantData? = nil {
 		didSet {
 			if let data = participantData {
-				limeBadge.isHidden = true
 				avatar.fillFromAddress(address: data.participant.address!)
 				displayName.text = data.participant.address?.addressBookEnhancedDisplayName()
 				sipAddress.text = data.participant.address?.asStringUriOnly()
@@ -74,29 +70,14 @@ class VoipParticipantCell: UITableViewCell {
 		}
 	}
 	
-	var scheduleConfParticipantAddress: Address?  = nil {
-		didSet {
-			if let address = scheduleConfParticipantAddress {
-				avatar.fillFromAddress(address: address)
-				displayName.text = address.addressBookEnhancedDisplayName()
-				sipAddress.text = address.asStringUriOnly()
-				self.isAdminView.isHidden = true
-				self.removePart?.isHidden = true
-			}
-		}
-	}
-	
 	
 	override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
 		super.init(style: style, reuseIdentifier: reuseIdentifier)
-		contentView.height(VoipParticipantCell.cell_height).matchParentSideBorders().done()
+		contentView.height(cell_height).matchParentSideBorders().done()
+		
 	
 		contentView.addSubview(avatar)
 		avatar.size(w: VoipCallCell.avatar_size, h: VoipCallCell.avatar_size).centerY().alignParentLeft(withMargin: avatar_left_margin).done()
-		
-		limeBadge.contentMode = .scaleAspectFit
-		contentView.addSubview(limeBadge)
-		limeBadge.toRightOf(avatar,withLeftMargin: lime_badge_offset).width(lime_badge_width).done()
 	
 		let nameAddress = UIView()
 		nameAddress.addSubview(displayName)
@@ -124,7 +105,6 @@ class VoipParticipantCell: UITableViewCell {
 		isAdminView.height(check_box_size).toLeftOf(removePart!).centerY().done()
 
 		
-		
 	}
 	
 	required init?(coder: NSCoder) {
diff --git a/Classes/Voip/Widgets/Avatar.swift b/Classes/Voip/Widgets/Avatar.swift
index 930dd8731..8e4084fa5 100644
--- a/Classes/Voip/Widgets/Avatar.swift
+++ b/Classes/Voip/Widgets/Avatar.swift
@@ -42,6 +42,7 @@ class Avatar : UIImageView {
 	}
 	
 	
+	
 	func fillFromAddress(address:Address) {
 		if let image = address.contact()?.avatar() {
 			self.image = image
diff --git a/Classes/Voip/Widgets/ButtonWithStateBackgrounds.swift b/Classes/Voip/Widgets/ButtonWithStateBackgrounds.swift
index 5e0221c15..fa437dc8f 100644
--- a/Classes/Voip/Widgets/ButtonWithStateBackgrounds.swift
+++ b/Classes/Voip/Widgets/ButtonWithStateBackgrounds.swift
@@ -28,12 +28,11 @@ class ButtonWithStateBackgrounds : UIButton {
 		super.init(coder: coder)
 	}
 	
-	init (backgroundStateColors: [UInt: LightDarkColor], iconName:String? = nil) {
+	init (backgroundStateColors: [UInt: LightDarkColor]) {
 		super.init(frame: .zero)
 		backgroundStateColors.keys.forEach { (stateRawValue) in
 			setBackgroundColor(color: backgroundStateColors[stateRawValue]!.get(), forState: UIButton.State(rawValue: stateRawValue))
 		}
-		iconName.map { setImage(UIImage(named: $0), for: .normal) }
 	}
 	
 	func setBackgroundColor(color: UIColor, forState: UIControl.State) {
diff --git a/Classes/Voip/Widgets/FormButton.swift b/Classes/Voip/Widgets/FormButton.swift
deleted file mode 100644
index 309334afc..000000000
--- a/Classes/Voip/Widgets/FormButton.swift
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-iphone
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-import Foundation
-import UIKit
-import SwiftUI
-
-class FormButton : ButtonWithStateBackgrounds {
-
-	let button_radius = 3.0
-	let button_height = 40.0
-	
-	required init?(coder: NSCoder) {
-		super.init(coder: coder)
-	}
-	
-	var title: String? {
-		didSet {
-			setTitle(title, for: .normal)
-			addSidePadding()
-		}
-	}
-	
-	init () {
-		super.init(backgroundStateColors: VoipTheme.primary_colors_background)
-		layer.cornerRadius = button_radius
-		clipsToBounds = true
-		applyTitleStyle(VoipTheme.big_button)
-		height(button_height).done()
-		addSidePadding()
-	}
-	
-}
diff --git a/Classes/Voip/Widgets/StyledCheckBox.swift b/Classes/Voip/Widgets/StyledCheckBox.swift
deleted file mode 100644
index b5bf8323f..000000000
--- a/Classes/Voip/Widgets/StyledCheckBox.swift
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-iphone
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import Foundation
-import UIKit
-import DropDown
-
-
-class StyledCheckBox: UIButton {
-	
-	// layout constants
-	let button_size = 25.0
-
-	
-	required init?(coder: NSCoder) {
-		super.init(coder: coder)
-	}
-	
-	init (liveValue:MutableLiveData<Bool>) {
-		super.init(frame: .zero)
-		setBackgroundImage(UIImage(named:"voip_checkbox_unchecked")/*?.tinted(with: VoipTheme.light_grey_color)*/,for: .normal) // tinting not working with those icons
-		setBackgroundImage(UIImage(named:"voip_checkbox_checked")/*?.tinted(with: VoipTheme.primary_color)*/,for: .selected)
-		onClick {
-			liveValue.value = !liveValue.value!
-			self.isSelected = liveValue.value!
-		}
-		
-		size(w: button_size,h: button_size).done()
-		
-		liveValue.readCurrentAndObserve { (value) in
-			self.isSelected = value!
-		}
-		
-		
-   }
-
-
-}
diff --git a/Classes/Voip/Widgets/StyledDatePicker.swift b/Classes/Voip/Widgets/StyledDatePicker.swift
deleted file mode 100644
index fc51cfd3b..000000000
--- a/Classes/Voip/Widgets/StyledDatePicker.swift
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-iphone
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import Foundation
-import UIKit
-
-class StyledDatePicker: UIView {
-	
-	// layout constants
-	let chevron_margin = 10
-	let form_input_height = 38.0
-
-	
-	var liveValue:MutableLiveData<Date>?
-	let formattedLabel = StyledLabel(VoipTheme.conference_scheduling_font)
-	var pickerMode:UIDatePicker.Mode = .date
-	
-	required init?(coder: NSCoder) {
-		super.init(coder: coder)
-	}
-	
-	init (liveValue:MutableLiveData<Date>, pickerMode:UIDatePicker.Mode, readOnly:Bool = false) {
-		super.init(frame: .zero)
-		self.liveValue = liveValue
-		self.pickerMode = pickerMode
-
-		let datePicker = UIDatePicker()
-		addSubview(datePicker)
-		datePicker.datePickerMode = pickerMode
-		datePicker.addTarget(self, action: #selector(valueChanged), for: .valueChanged)
-		datePicker.matchParentDimmensions().done()
-		
-		formattedLabel.isUserInteractionEnabled = false
-		formattedLabel.backgroundColor = VoipTheme.voipFormBackgroundColor.get()
-		addSubview(formattedLabel)
-		formattedLabel.matchParentDimmensions().done()
-		
-		let chevron = UIImageView(image: UIImage(named: "chevron_list_close"))
-		addSubview(chevron)
-		chevron.alignParentRight(withMargin: chevron_margin).centerY().done()
-		chevron.isHidden = readOnly
-		
-		setFormInputBackground(readOnly:readOnly)
-		height(form_input_height).done()
-		
-		datePicker.date = liveValue.value!
-		self.valueChanged(datePicker: datePicker)
-		
-		if (readOnly) {
-			formattedLabel.textColor = formattedLabel.textColor.withAlphaComponent(0.5)
-		}
-		isUserInteractionEnabled = !readOnly
-		
-   }
-
-	
-	@objc func valueChanged(datePicker: UIDatePicker) {
-		liveValue!.value = datePicker.date
-		formattedLabel.text = "  "+(pickerMode == .date ? TimestampUtils.dateToString(date: datePicker.date) : TimestampUtils.timeToString(date: datePicker.date))
-	}
-}
diff --git a/Classes/Voip/Widgets/StyledSwitch.swift b/Classes/Voip/Widgets/StyledSwitch.swift
deleted file mode 100644
index cc96c80d9..000000000
--- a/Classes/Voip/Widgets/StyledSwitch.swift
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-iphone
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import Foundation
-import UIKit
-
-class StyledSwitch: UISwitch {
-	
-	var liveValue:MutableLiveData<Bool>?
-	
-	required init?(coder: NSCoder) {
-		super.init(coder: coder)
-	}
-	
-	init (liveValue:MutableLiveData<Bool>) {
-		super.init(frame: .zero)
-		self.liveValue = liveValue
-		tintColor = VoipTheme.light_grey_color
-		onTintColor = VoipTheme.green_color
-		addTarget(self, action: #selector(valueChanged), for: .valueChanged)
-		liveValue.readCurrentAndObserve { (value) in
-			self.isOn = value == true
-		}
-		transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
-   }
-
-	@objc func valueChanged(mySwitch: UISwitch) {
-		liveValue!.value = mySwitch.isOn
-	}
-}
diff --git a/Classes/Voip/Widgets/StyledTextView.swift b/Classes/Voip/Widgets/StyledTextView.swift
deleted file mode 100644
index 190203675..000000000
--- a/Classes/Voip/Widgets/StyledTextView.swift
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-iphone
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import Foundation
-
-class StyledTextView: UITextView, UITextViewDelegate {
-	
-	var placeholder:String?
-	var style:TextStyle?
-	var liveValue: MutableLiveData<String>? = nil
-
-	required init?(coder: NSCoder) {
-		super.init(coder: coder)
-	}
-	
-	init (_ style:TextStyle, placeHolder:String? = nil, liveValue: MutableLiveData<String>, readOnly:Bool = false) {
-		self.style = style
-		self.liveValue = liveValue
-		super.init(frame:.zero, textContainer: nil)
-		applyStyle(style)
-		setFormInputBackground(readOnly:readOnly)
-		placeHolder.map {
-			self.placeholder = $0
-		}
-		delegate = self
-		liveValue.readCurrentAndObserve { (value) in
-			self.text = value
-			if (value == nil || value?.count == 0) {
-				self.showPlaceHolder()
-			}
-		}
-		if (readOnly) {
-			textColor = textColor?.withAlphaComponent(0.5)
-		}
-		isUserInteractionEnabled = !readOnly
-   }
-		
-	func textViewDidBeginEditing(_ textView: UITextView) {
-		if text == placeholder {
-			placeholder = textView.text
-			text = ""
-			textColor = style?.fgColor.get().withAlphaComponent(1.0)
-		}
-	}
-
-	func textViewDidEndEditing(_ textView: UITextView) {
-		if text == "" {
-			showPlaceHolder()
-		}
-	}
-	
-	private func showPlaceHolder() {
-		text = placeholder
-		textColor = style?.fgColor.get().withAlphaComponent(0.5)
-	}
-	
-	func textViewDidChange(_ textView: UITextView) {
-		liveValue?.value = textView.text
-	}
-	
-}
diff --git a/Classes/Voip/Widgets/StyledValuePicker.swift b/Classes/Voip/Widgets/StyledValuePicker.swift
deleted file mode 100644
index a8bd5b857..000000000
--- a/Classes/Voip/Widgets/StyledValuePicker.swift
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2010-2020 Belledonne Communications SARL.
- *
- * This file is part of linphone-iphone
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import Foundation
-import UIKit
-import DropDown
-
-
-class StyledValuePicker: UIView {
-	
-	// layout constants
-	let chevron_margin = 10.0
-	let form_input_height = 38.0
-
-	
-	let formattedLabel = StyledLabel(VoipTheme.conference_scheduling_font)
-	var pickerMode:UIDatePicker.Mode = .date
-	
-	required init?(coder: NSCoder) {
-		super.init(coder: coder)
-	}
-	
-	init (liveIndex:MutableLiveData<Int>, options:[String], readOnly:Bool = false) {
-		super.init(frame: .zero)
-
-		formattedLabel.isUserInteractionEnabled = false
-		formattedLabel.backgroundColor = VoipTheme.voipFormBackgroundColor.get()
-		formattedLabel.text =  "  "+options[liveIndex.value!]
-		
-		if (readOnly) {
-			formattedLabel.textColor = formattedLabel.textColor.withAlphaComponent(0.5)
-		}
-		
-		addSubview(formattedLabel)
-		formattedLabel.alignParentLeft().alignParentRight(withMargin: (readOnly ? chevron_margin : form_input_height)).matchParentHeight().done()
-		
-		let chevron = UIImageView(image: UIImage(named: "chevron_list_close"))
-		addSubview(chevron)
-		chevron.alignParentRight(withMargin: chevron_margin).centerY().done()
-		chevron.isHidden = readOnly
-
-		setFormInputBackground(readOnly:readOnly)
-
-		
-		DropDown.appearance().textColor = VoipTheme.conference_scheduling_font.fgColor.get()
-		DropDown.appearance().selectedTextColor = VoipTheme.conference_scheduling_font.fgColor.get()
-		DropDown.appearance().textFont = formattedLabel.font
-		DropDown.appearance().backgroundColor = .white
-		DropDown.appearance().selectionBackgroundColor = VoipTheme.light_grey_color
-		DropDown.appearance().cellHeight = form_input_height
-		
-		let dropDown = DropDown()
-		dropDown.anchorView = self
-		dropDown.bottomOffset = CGPoint(x: 0, y:(dropDown.anchorView?.plainView.bounds.height)!)
-		dropDown.dataSource = options
-		dropDown.backgroundColor = .white
-		
-		dropDown.selectionAction = { [unowned self] (index: Int, item: String) in
-			liveIndex.value = index
-			dropDown.selectRow(at: index)
-			//dropDown.tableView.scrollToRow(at: IndexPath(row: index, section: 0), at: .middle, animated: true)
-			formattedLabel.text = "  "+options[liveIndex.value!]
-			dropDown.hide()
-		}
-	
-		onClick {
-			dropDown.show()
-		}
-		
-		height(form_input_height).done()
-		
-		liveIndex.readCurrentAndObserve { (value) in
-			dropDown.selectRow(value!)
-		}
-		isUserInteractionEnabled = !readOnly
-
-		
-		
-   }
-	
-	
-
-
-}
diff --git a/Podfile b/Podfile
index d8ffbb540..4bdf972fb 100644
--- a/Podfile
+++ b/Podfile
@@ -27,8 +27,6 @@ target 'linphone' do
   # Pods for linphone
 	pod 'SVProgressHUD'
 	pod 'SnapKit'
-	pod 'DropDown'
-	pod 'IQKeyboardManager'
 	all_pods
 
 end
diff --git a/Resources/images/security_toggle_icon_green.png b/Resources/images/security_toggle_icon_green.png
deleted file mode 100644
index 368e30c79ebda242dfa4cef453ed21ca41c8e0ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1870
zcmV-U2eJ5xP)<h;3K|Lk000e1NJLTq002J#002n{1^@s6iX{F600004XF*Lt006O%
z3;baP000LCNkl<Zcmd^HeQXp(6rVS{S6Wh$)FO%$dZhx9Aecacw0FQi8jZwAv?Q9;
zf?9f&KL{!T#1M=mAQ3?#Z4o38WB4=>OcZ0JA5<_FiADm&(z^;M5^7AK_UmrPH;a4O
zyYAiX-tO)7ZYL=_`)1z9@7{dAnFUB1(xD5}a&C3s*$9kOF#=!Yj~=zMa>g$`cAElr
zE39vE&yX0~PZ)btrMm+_tnzuUw5n(+&)NolufI6A?{`>7fURPTxrQJEB2gf9F34T;
zN_qS3A>}C`*aE(;x%f#!*vE{KNr^C^LDvWfD}3J0qlxO8El(-<ou}PXNQiAg;0ui!
z3IL7xx1z@5|Jf+7-ufv4zwd{s_x1Gmt|yH6&=66tF+=KMS3m>z5OKr?-`vaBhm@Nn
zSPH(OZE|7g-+`4VbUF6xdraD<VuyZ|*+3z0(=zYHKUD>$vX+4Vw7GOl9}B*L&HHt<
zCf}4r@tA@10)cuW=6qm9OE3kVPg{&h%NZdrVH3}bXSc;=K>~1;3T%5#S=X6lWg7;6
zip>`<wRSDSfeb-2PqK=w;zIy!gwl_4$Fsvr+<`tLa&>{n{tNXjrE?hxE(Qh_2zsm$
zC3e)snE}@Z>=;mTU`m<$n+4DqOr$q1_+70fvqM3)m;tN66<JXtVZ*4r8z>xMgdQmr
z#<o_>J=3dYTLk#}=F&$949=Gr%*TRx=<)ltm@<imEn)!eJ&WT~qd-|>&O>lU=^n7F
zwRmPINY*eQ3(&h`G6`66w&Ju2>;xTI__7!blD*hhX5wh=ki<sdGW&U{_txjQmvDl&
zHT)_GBdG@286?Um#l9Xf=s5#9c615BI|XbsPDD<z&pXrexL<Ux=drsx7d!zeL@|15
zOS~+)&!zuexXI`FtLZnyehUD|4IJ&^n*FNNuTc;wf@jVHk6vezc<)~n7x|9!Jg)8k
zUN-C8Ag=JJ<G|y}<_7P0jvVkX8g*F)Kj8u4(*GO&^p8SzSwPu28T``^cl6^{{=8j!
zhl3tm-Tfqk=l|eQ@!8>ElwCI9iSS*|%isw~I`(as!B*+Pjofu#*_E4Ip1h?MMR1Jg
zaXBwH`7rob%lut9@mqEVW|fyxAqT@Zjfz}#FylLgnAK00a6-Ws29MFK!wNB5pE#wr
z*UahsO~DriKca}7#KNrJ-r_M^*z5cU2!oeTF&K#`RDPjsd1Ame0$&)s43M%T*#cAp
zM|XjDR>W<u2=KY%;VWdiqrsT@B%u2$;BZI{Bm%tL^Z`CoSICAu-@l6h4bfO4z{`ac
zw(-i*6*K((RJEs5-pQ$P3;|zT?r+EF4sZThlQ2qMrv+vRcwPw)az50moS8JZ0V4~J
zYuT;|zSh(EEp7mQ)ndpv8j#IAWTj=dCV06bz(y^GjG_VgBd>_m$Feylc)a#`5WU|P
zi!l@E7^B;$TtU&YHzs&o>M{Y~O)aL3paFCh6y)!YXKPIGoT=IyXu@gl%Xk8YZ5bo$
zE2drGmyu$oxZpXL=pw7|k?>AiObux$z*gJr^ZNHEQk@X|Ymawb#H*foZ9Fp)0v`}v
ztcG{nL>4Cm&jl1eC~m+o=fy<AhDAApEwaOO7^4e34{sBJEX9)!Nr%jIR_Vx{z~0kq
zfG+S{SZ#R#gPe4mUcq+P!)87xio%QWrnYFCbc5%Nc}47P40jF70}ecbT3cP#`C~M|
zc<;E5F_w0=OfDhP00#ZpXk(nItBqbiiHowQ^bB%pD-3y_GuC=8cjC&aN-ZRvdGy|O
zA_$d6fpeP;gXc^&-oSCZ(!Gi2)0}#Ui!4-5V2s*gxY;WT<PQ*<-3KrtTA|SFeDZ(`
zC9r6jH*hRjy-9hVE91><;yAGqr@zz5DmTXmtIYuCx|0Uanfd&mBj!JgKSVo!w=DtP
z>hlKPH>)q{X0KNK$=TBJ!GXa>J)euJ`I5>5)Yp0g{9{Ga$rA9~icgy+74<=|2}7T5
z(^kb40Q+&nQkBfet|ih`vsVjTI`7KW9Dy#tMNmLZw<?dbOM}l_wZtmm+%C&JuYlZh
zddj$gQ2*CB3rtsN=AW>+c3xn$c{!01EC<iU?>%2Uy7x973Nlh2sm|cr-EZpOs_}Gf
zHOQ%}x@FB?t!>F;fqx3caZliUcu-9@nD4<$;m@TCIJYGwo>zn1+2mdaAiaw-fqq>;
z{1iCw)O|Z|3wW-iuBGG|!b1D-2PjbgFxq)IkvED|^46nWZXH#>H%#i>-Rhn=7-W1o
zJV#3u&JuliKW>fB<KJ%Oh_0neq1gtWD?G$r5V~91*5Y>f9o!p)|I-jOqD>H7Rn_Gk
z7Zk(nc-jhH0o3q)$@EZA+JPa)sp#!Zg`U|vqR-Bix~Y8r2Zjpu*1S}+djJ3c07*qo
IM6N<$g6eXLg#Z8m

diff --git a/Resources/images/security_toggle_icon_grey.png b/Resources/images/security_toggle_icon_grey.png
deleted file mode 100644
index c772357943de9d370117e4625d9c6b57218f0bd2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2420
zcmV-)35)iLP)<h;3K|Lk000e1NJLTq002J#002n{1^@s6iX{F600004XF*Lt006O%
z3;baP000RqNkl<Zcmd^HO-xi*6qXqn24;|o^#_WTs{F>k8bzZvn#QUm>P{D$P}2o5
zwHp`R*u-cz?&?C*C`lXBof;E=;twPy*1EC5gpDK!MCdTX2!wweW|$fJoeB5l&7Jq=
z{oVH<I*GaOzI)#}=R4=zbI<+3oFxnJyLj=U>(#4QWyxf6x!dg?^Z9)JckbLtI4w$!
z(+rOuJz5x#$14(vL;>TSmzNhUEG+DW0;bqICrZb_leOF0+Dd0<XIIV5%_;KD&(9z7
zdc8rXyg*S1(ON%n;6O2etpV_SE!r-ZYZgNx@aWN_QLVmK+ieAZ`t)h<z`#H`EM06=
zP$*#v!y)kS;lmF`zt!8{7VvQK+}E#Pmqnw|6?z3x>zA9GJB)xhfT0jm>tpu4Q1ApA
z<9Zc>*-HF#nH7rvE+;1k&NDYuQBe_YZf>6C+s)R6fNyGQ$_oSnt02S*k)U}{ObNxs
z#qULUf+g@YZ2>F+Ual6wc>tp7hzFyX9tW*VkA}e$$is&ZFM}0UAW89y0%MjAl<>jh
z@eFR+vSk#*E@_00F7O2S#EBEWnVFfASS+>-^;{!Noal?`F$oVG!;l!cef#zV4G}HA
zS-~GXc+dx;1hxcL&eI~cSlS_Pf`$dk(VaVYPN{iB8u;VKj~9%Oj~C%XKT^=5#b{xp
z3MLQ0ziAAONqjrGZQHhKri>g4TCnQsj|Hrja!46SpvK`5@7(LxudgKF_(<5itR=t#
zw^P#K4Tr-K*T>-6W|WEG?fO)#ouQwlOP78!uATv&UVO5aN1V&CoUCA-?z(d2N@Hnh
z={J!`ByjWQ&EH#FTL%?YZQ&(yj+Iy<|5#8^um;QIf6kpd_ZL=;hB7*yy?euk4Yaf3
z<{R|ZuU@_SJ!XubkQ=N<u3c4MU;iC8E&lH4=$Oz;L#rS1kMc8T&ivu``@beWB_$<b
zQy;~KN4wUyS=uKoyFFQ4&H(FgvQRS#EPrqIndlHbqARDt^Od*hc?P{X7ZMyxu0yWQ
zGZUo%HQ>Zgi7zilwmQ=GxVyT#`ZM6y+*?y4G&wohL9ULh$tUka_05|%e`|IKWCM<1
zHF)F3jbD0tdZy((jXXoHLCWwbhc7hpp}a2%KmZA-C<SN%M^J6T-rj&*4x`Ul{SCNl
zYHEB~3R+s1Q*aZd06oC5fzfXiEZ_gZg9kyfycd=?yt~R16QKa7fCF!$v9U4i-nen2
z2UaWL!I-IAQGipx2^WTE48wKEU0GS_qJ20sV3ocxqW~v?lgx<pQ{CO&qwbR@PbT{N
z`&Z*#+Qx<wFum`LD8Omp^B6{8`6>7F=g;Rb?rF?>^n%mVPmcoDu3g)C?AWp2_ymUN
z({x5rT|{u><)y7}$QMnewE#~irfKsu|ACphmI81H(SY$s8!2f&JAo4;WQYAYQA(!3
zBfqBw&ayNK1XZ#r04y@nYrBC%*|WE9-Ad&MDezTQRY`>ZwA@(`_7oWn1xT#y20qVd
z3gdl*o>Q8C^5jXBG$Ki1!vl@omoHyl0BN-w7zt{(V~oq;U<ppUxT&Ayc33J(FIl6=
zlA`+Fy?cKJ&6Kw(&~{Th^;2jQ_6p14aYjrMq^_=RiKt|U5ocw#>5TQE65eNNF(jv@
z@*KT;_il)_NtWNbb?XEj`LG62r3UbfAs}iwtRz41jmh6jmZ$l?wzjqa*`9P!NZ!%R
zb2i`<++MtR@pE~3c|BQNPTwvMz<3XJc6Lga93;yVbFAyrG$R+t=(84ZN?<NuzT8G7
zDT1dj+5>1YbN~MRwA)^i<%#*JQ>S8~P)PN*6fdA!T@P>;)w4~5B0T`dRKr-wNx_a}
zPXkY`k2yad9$<QN!w7JuJSP-TR#w*A-rgQ(JTt)4i#>bxM6oqxD&a8$oC#y60x*Oo
z;c4#~FIJ{mo?eo6)~#FThnpDM*Rukg31gQ65aokiU0pMb4=XdkQv)_N;|LJTStqSh
z1aQVfv;ttn_~XZq`z~F&#8^nBB6uwHqgd?F?vCb(&c1#7K0kZ*?4Kf+rFs+)3<g{J
z`ua34DB?P62zwT3QJ$eso9fuh`BK;J=nwdb1kPlj*&y3ANPJmewGy+%EN)^9skW;%
zJbn6f6#2d$&1M8gQLD3T3V=m3`0`jVYlYbr6uyn>s+Ong8weDdTf|r%w#o^M0?ufv
zDS+q8`m++=7~8#j_b{s~m5O7Yb)-}fW1mt_FMG$A&z?Q&!J?=ahm`KIv9W)zUAuMx
z0Vd4%vr?xRKw})6tsW?M=*^oq&F9abPg6QiAE&v2>({Sm^<2$OOGI+Ip;gBdU(9uk
z^(pL8ye03=Ca0>~vyb3*5nSUEYDq@hj*<Wu6&3xb1)O+mf~QW~w{IT+v5X{v+7{an
zL7FZlNA$?03p_<kT;S=`LvSJc0C<!PrB?>cF)t^Ct08Mp*PLSH-#GP5ZjN6kuEgj*
zw$^2N1^`n>5YwM7mtx;IRYI<i5#S`3A<NST4Gj(X&~h!NoUGF%^>ylpfINZo`ffcz
zPA-!n%hQLn%?)O~av}@)Oerj_)r|rtnGIW>0X=f$$QQVKPY0X}_JgY@k;!$M{R=F^
zmS;%8Fofu8``^AXeo7@aB;T0@PV`KJCpX)%V@EG#Q%Zu_{SFon-n)0t(uS*Pw`bt?
z@86$`7*K<{p`9Q0y~%PAkv(AYTj?{?mS+^O=^4j)_ghLZ*gHE*SbSInaFWro<rz>c
zfIQRF)76*)g<f)C^ykZwmX;P%k)5NHstTK{vFuD>`8$pXOqUvk(PcuD#WBtHnVHfU
z4ZgJO_Hu%h1K{soJ4I)Kp!c3OAw>cwxrJMZJOJl!v<2ozu5Eb;V7saxx2tt8R^-Oe
zdKPMV#*BjCu3fvjtmFZdz+iW%2R9`%4jULBtEI4jrzXguLx)P?0cC3KO7AhgV*uY{
zC4o_*%fA!u_B;c+@3v{vrU(>Jj6kUAX&Bez_{*nmOlP)Fowi$^DT7vnIQ#z!^|Z5i
z)=t3;>1q(i$b+H-8{@&3j)5n}us;0-HZ6u|C`h~!8$Mus)Bl#@=w5*&0IwB0>$D?`
mli)9*057Z^cGB8%T>k^8-7z53v%1&-0000<MNUMnLSTZx@0T<H

diff --git a/Resources/images/voip_checkbox_checked.png b/Resources/images/voip_checkbox_checked.png
deleted file mode 100644
index 042f73d9dc6d4be6d8bedb63ae1cfb82dffd44c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 355
zcmeAS@N?(olHy`uVBq!ia0vp^x**KK3=%mav;s)6q&xaLGB9lH=l+w(3gj~u2e~^j
ztUD+3638(Q@Ck8sFYx&v$MFB$hW}GS{>L+b5D+9VfDn+~YWx4e+5g1~|G&Qbe`xOi
zHP!!T$A_Ou5C&@JDhcun2C1HS_kWbzqq-vxb^}Fsc)B=-cpQH_^`=m>0*|ZjhAhQ~
z|Npn9t~72l6OiA1NBx*(@stS<O#UjT>~=OcUd(QAplliAi4z+cw3nY%V&6a0ZI8q9
zU9P5c1r$u@UO9f)@a?BcYu&k5%QkqI<X;h*+p>`9*%GlAN=I7Prrf&xv2NM4eJl$f
z#pu2>O6mD??n)7B^1+?Eg5UqO>{#;JG5Y0##d~wF-kq#p%JV9-;7ZBa1*`u&KeNZx
s@?-11qT}b7e_V_Co^5Xb^>sDFxuqg*7h+$R1O33@>FVdQ&MBb@09Zq#9RL6T

diff --git a/Resources/images/voip_checkbox_unchecked.png b/Resources/images/voip_checkbox_unchecked.png
deleted file mode 100644
index b01cbcb1e02375b3689f0e673e1a71965f470c6d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^x**KL3?xsO{9g&ASkfJR9T^xl_H+M9WCijWi-X*q
z7}lMWc?sl52l#}zx)=B?TC`~4!i9?$FNQGw|NnpBz=21P9%=9I1R2U&666=m5c$wy
z;%a+=n?M04PZ!4!i_^&o5;X@jL_{qdj)q=5(!B7|!iP^!EHDvJi<{QQ6Xkx?{V2Q3
xo<+=(3YXNS8aj6`>eO~PI+Hc<pu@93hCN~THp*>1F#%{AgQu&X%Q~loCIH6jOoIRb

diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index afad71813..907c0c136 100644
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -662,9 +662,6 @@
 		C61B1BF22667D075001A4E4A /* menu_security_default.png in Resources */ = {isa = PBXBuildFile; fileRef = C61B1BF12667D075001A4E4A /* menu_security_default.png */; };
 		C61B1BF42667D202001A4E4A /* more_menu_default.png in Resources */ = {isa = PBXBuildFile; fileRef = C61B1BF32667D202001A4E4A /* more_menu_default.png */; };
 		C61B1BF72667EC6B001A4E4A /* ephemeral_messages_color_A.png in Resources */ = {isa = PBXBuildFile; fileRef = C61B1BF62667EC6B001A4E4A /* ephemeral_messages_color_A.png */; };
-		C61E409B275A20A300CCE602 /* ConferenceSchedulingSummaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C61E409A275A20A300CCE602 /* ConferenceSchedulingSummaryView.swift */; };
-		C61E409D275A94E300CCE602 /* UILabelExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C61E409C275A94E300CCE602 /* UILabelExtensions.swift */; };
-		C61E409F275A962100CCE602 /* FormButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = C61E409E275A962100CCE602 /* FormButton.swift */; };
 		C622E3EF26A81290004F5434 /* vr_stop.png in Resources */ = {isa = PBXBuildFile; fileRef = C622E3E926A8128F004F5434 /* vr_stop.png */; };
 		C622E3F026A81290004F5434 /* vr_wave.png in Resources */ = {isa = PBXBuildFile; fileRef = C622E3EA26A8128F004F5434 /* vr_wave.png */; };
 		C622E3F126A81290004F5434 /* vr_on.png in Resources */ = {isa = PBXBuildFile; fileRef = C622E3EB26A8128F004F5434 /* vr_on.png */; };
@@ -770,8 +767,6 @@
 		C6824FBA27219D890043D4FC /* IncomingCallView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6824FB927219D890043D4FC /* IncomingCallView.swift */; };
 		C683B20E2722702300D4E15C /* VoipTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = C683B20D2722702300D4E15C /* VoipTheme.swift */; };
 		C683B213272276CF00D4E15C /* UIColorExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C683B212272276CF00D4E15C /* UIColorExtensions.swift */; };
-		C690CCB1275764CD00609077 /* ConferenceSchedulingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C690CCB0275764CD00609077 /* ConferenceSchedulingView.swift */; };
-		C690CCB42757683800609077 /* NavigationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C690CCB32757683800609077 /* NavigationView.swift */; };
 		C6A1BB3526E8815400540D50 /* menu_info.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A1BB3126E8815300540D50 /* menu_info.png */; };
 		C6A1BB3626E8815400540D50 /* menu_forward_default.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A1BB3226E8815400540D50 /* menu_forward_default.png */; };
 		C6A1BB3726E8815400540D50 /* menu_copy_text_default.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A1BB3326E8815400540D50 /* menu_copy_text_default.png */; };
@@ -807,26 +802,10 @@
 		C6D09F4127428626003C2173 /* IceState.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6D09F4027428626003C2173 /* IceState.swift */; };
 		C6D09F43274288D4003C2173 /* PayloadType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6D09F42274288D4003C2173 /* PayloadType.swift */; };
 		C6D09F4B27438707003C2173 /* CallsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6D09F4A27438706003C2173 /* CallsListView.swift */; };
-		C6D1E41B275937A0008EB388 /* UIButtonExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6D1E41A275937A0008EB388 /* UIButtonExtensions.swift */; };
-		C6D1E41E2759396B008EB388 /* voip_checkbox_unchecked.png in Resources */ = {isa = PBXBuildFile; fileRef = C6D1E41C2759396B008EB388 /* voip_checkbox_unchecked.png */; };
-		C6D1E41F2759396B008EB388 /* voip_checkbox_checked.png in Resources */ = {isa = PBXBuildFile; fileRef = C6D1E41D2759396B008EB388 /* voip_checkbox_checked.png */; };
-		C6D1E42127593A30008EB388 /* StyledCheckBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6D1E42027593A30008EB388 /* StyledCheckBox.swift */; };
-		C6D1E42427595988008EB388 /* security_toggle_icon_grey.png in Resources */ = {isa = PBXBuildFile; fileRef = C6D1E42227595987008EB388 /* security_toggle_icon_grey.png */; };
-		C6D1E42527595988008EB388 /* security_toggle_icon_green.png in Resources */ = {isa = PBXBuildFile; fileRef = C6D1E42327595988008EB388 /* security_toggle_icon_green.png */; };
 		C6D1EC4A274D212B0091881C /* UICamSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = C6D1EC49274D212B0091881C /* UICamSwitch.m */; };
 		C6D52B45274648E500904660 /* VoipGridParticipantCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6D52B44274648E500904660 /* VoipGridParticipantCell.swift */; };
 		C6DA657C261C950C0020CB43 /* VFSUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6DA657B261C950C0020CB43 /* VFSUtil.swift */; };
-		C6DB1DE22757E35F00A22704 /* StyledTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6DB1DE12757E35F00A22704 /* StyledTextView.swift */; };
-		C6DB1DE42758E49E00A22704 /* StyledSwitch.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6DB1DE32758E49E00A22704 /* StyledSwitch.swift */; };
-		C6DB1DE6275903C500A22704 /* StyledDatePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6DB1DE5275903C500A22704 /* StyledDatePicker.swift */; };
-		C6DB1DE82759136100A22704 /* StyledValuePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6DB1DE72759136000A22704 /* StyledValuePicker.swift */; };
 		C6EA2F4827514D09008E60F8 /* voip_call_forward.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EA2F4727514D08008E60F8 /* voip_call_forward.png */; };
-		C6EA2F592754C91C008E60F8 /* ScheduledConferenceData.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6EA2F582754C91C008E60F8 /* ScheduledConferenceData.swift */; };
-		C6EA2F5F2754CFB0008E60F8 /* TimestampUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6EA2F5E2754CFB0008E60F8 /* TimestampUtils.swift */; };
-		C6EA2F632754DBBE008E60F8 /* TimeZoneData.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6EA2F622754DBBE008E60F8 /* TimeZoneData.swift */; };
-		C6EA2F672754DC45008E60F8 /* ConferenceSchedulingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6EA2F662754DC45008E60F8 /* ConferenceSchedulingViewModel.swift */; };
-		C6EA2F6B2754DDF9008E60F8 /* Duration.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6EA2F6A2754DDF9008E60F8 /* Duration.swift */; };
-		C6EA2F6D2754E3DC008E60F8 /* MediatorLiveData.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6EA2F6C2754E3DC008E60F8 /* MediatorLiveData.swift */; };
 		C6F2D4EF27392D970071BA52 /* CallsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6F2D4EE27392D960071BA52 /* CallsViewModel.swift */; };
 		C6F2D4F1273935860071BA52 /* CallExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6F2D4F0273935860071BA52 /* CallExtensions.swift */; };
 		C6F2D4F32739475C0071BA52 /* ActiveCallView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6F2D4F22739475C0071BA52 /* ActiveCallView.swift */; };
@@ -1821,9 +1800,6 @@
 		C61B1BF12667D075001A4E4A /* menu_security_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_security_default.png; sourceTree = "<group>"; };
 		C61B1BF32667D202001A4E4A /* more_menu_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = more_menu_default.png; sourceTree = "<group>"; };
 		C61B1BF62667EC6B001A4E4A /* ephemeral_messages_color_A.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ephemeral_messages_color_A.png; sourceTree = "<group>"; };
-		C61E409A275A20A300CCE602 /* ConferenceSchedulingSummaryView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConferenceSchedulingSummaryView.swift; sourceTree = "<group>"; };
-		C61E409C275A94E300CCE602 /* UILabelExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UILabelExtensions.swift; sourceTree = "<group>"; };
-		C61E409E275A962100CCE602 /* FormButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FormButton.swift; sourceTree = "<group>"; };
 		C622E3E926A8128F004F5434 /* vr_stop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = vr_stop.png; sourceTree = "<group>"; };
 		C622E3EA26A8128F004F5434 /* vr_wave.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = vr_wave.png; sourceTree = "<group>"; };
 		C622E3EB26A8128F004F5434 /* vr_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = vr_on.png; sourceTree = "<group>"; };
@@ -1930,8 +1906,6 @@
 		C6824FB927219D890043D4FC /* IncomingCallView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncomingCallView.swift; sourceTree = "<group>"; };
 		C683B20D2722702300D4E15C /* VoipTheme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoipTheme.swift; sourceTree = "<group>"; };
 		C683B212272276CF00D4E15C /* UIColorExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIColorExtensions.swift; sourceTree = "<group>"; };
-		C690CCB0275764CD00609077 /* ConferenceSchedulingView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConferenceSchedulingView.swift; sourceTree = "<group>"; };
-		C690CCB32757683800609077 /* NavigationView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationView.swift; sourceTree = "<group>"; };
 		C6A1BB3126E8815300540D50 /* menu_info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_info.png; sourceTree = "<group>"; };
 		C6A1BB3226E8815400540D50 /* menu_forward_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_forward_default.png; sourceTree = "<group>"; };
 		C6A1BB3326E8815400540D50 /* menu_copy_text_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_copy_text_default.png; sourceTree = "<group>"; };
@@ -1968,27 +1942,11 @@
 		C6D09F4027428626003C2173 /* IceState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IceState.swift; sourceTree = "<group>"; };
 		C6D09F42274288D4003C2173 /* PayloadType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PayloadType.swift; sourceTree = "<group>"; };
 		C6D09F4A27438706003C2173 /* CallsListView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallsListView.swift; sourceTree = "<group>"; };
-		C6D1E41A275937A0008EB388 /* UIButtonExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIButtonExtensions.swift; sourceTree = "<group>"; };
-		C6D1E41C2759396B008EB388 /* voip_checkbox_unchecked.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = voip_checkbox_unchecked.png; sourceTree = "<group>"; };
-		C6D1E41D2759396B008EB388 /* voip_checkbox_checked.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = voip_checkbox_checked.png; sourceTree = "<group>"; };
-		C6D1E42027593A30008EB388 /* StyledCheckBox.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StyledCheckBox.swift; sourceTree = "<group>"; };
-		C6D1E42227595987008EB388 /* security_toggle_icon_grey.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = security_toggle_icon_grey.png; sourceTree = "<group>"; };
-		C6D1E42327595988008EB388 /* security_toggle_icon_green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = security_toggle_icon_green.png; sourceTree = "<group>"; };
 		C6D1EC48274D212A0091881C /* UICamSwitch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICamSwitch.h; sourceTree = "<group>"; };
 		C6D1EC49274D212B0091881C /* UICamSwitch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UICamSwitch.m; sourceTree = "<group>"; };
 		C6D52B44274648E500904660 /* VoipGridParticipantCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VoipGridParticipantCell.swift; sourceTree = "<group>"; };
 		C6DA657B261C950C0020CB43 /* VFSUtil.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VFSUtil.swift; sourceTree = "<group>"; };
-		C6DB1DE12757E35F00A22704 /* StyledTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StyledTextView.swift; sourceTree = "<group>"; };
-		C6DB1DE32758E49E00A22704 /* StyledSwitch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StyledSwitch.swift; sourceTree = "<group>"; };
-		C6DB1DE5275903C500A22704 /* StyledDatePicker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StyledDatePicker.swift; sourceTree = "<group>"; };
-		C6DB1DE72759136000A22704 /* StyledValuePicker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StyledValuePicker.swift; sourceTree = "<group>"; };
 		C6EA2F4727514D08008E60F8 /* voip_call_forward.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = voip_call_forward.png; sourceTree = "<group>"; };
-		C6EA2F582754C91C008E60F8 /* ScheduledConferenceData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScheduledConferenceData.swift; sourceTree = "<group>"; };
-		C6EA2F5E2754CFB0008E60F8 /* TimestampUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimestampUtils.swift; sourceTree = "<group>"; };
-		C6EA2F622754DBBE008E60F8 /* TimeZoneData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimeZoneData.swift; sourceTree = "<group>"; };
-		C6EA2F662754DC45008E60F8 /* ConferenceSchedulingViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConferenceSchedulingViewModel.swift; sourceTree = "<group>"; };
-		C6EA2F6A2754DDF9008E60F8 /* Duration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Duration.swift; sourceTree = "<group>"; };
-		C6EA2F6C2754E3DC008E60F8 /* MediatorLiveData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MediatorLiveData.swift; sourceTree = "<group>"; };
 		C6F2D4EE27392D960071BA52 /* CallsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallsViewModel.swift; sourceTree = "<group>"; };
 		C6F2D4F0273935860071BA52 /* CallExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallExtensions.swift; sourceTree = "<group>"; };
 		C6F2D4F22739475C0071BA52 /* ActiveCallView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActiveCallView.swift; sourceTree = "<group>"; };
@@ -2262,7 +2220,6 @@
 		080E96DDFE201D6D7F000001 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
-				C6EA2F492752237C008E60F8 /* Conference */,
 				C65A5D41272184CE005BA038 /* SwiftUtil */,
 				C65A5D2D2721683B005BA038 /* Voip */,
 				22E0A81D111C44E100B04932 /* AboutView.h */,
@@ -2654,10 +2611,6 @@
 		633FEBE11D3CD5570014B822 /* images */ = {
 			isa = PBXGroup;
 			children = (
-				C6D1E42327595988008EB388 /* security_toggle_icon_green.png */,
-				C6D1E42227595987008EB388 /* security_toggle_icon_grey.png */,
-				C6D1E41D2759396B008EB388 /* voip_checkbox_checked.png */,
-				C6D1E41C2759396B008EB388 /* voip_checkbox_unchecked.png */,
 				C6EA2F4727514D08008E60F8 /* voip_call_forward.png */,
 				C6277DA7274BF1CD00406FB9 /* voip_radio_off.png */,
 				C6277DA6274BF1CD00406FB9 /* voip_radio_on.png */,
@@ -3360,7 +3313,6 @@
 			isa = PBXGroup;
 			children = (
 				C65A5D3727216CC0005BA038 /* MutableLiveData.swift */,
-				C6EA2F6C2754E3DC008E60F8 /* MediatorLiveData.swift */,
 			);
 			path = ViewModel;
 			sourceTree = "<group>";
@@ -3368,8 +3320,6 @@
 		C65A5D41272184CE005BA038 /* SwiftUtil */ = {
 			isa = PBXGroup;
 			children = (
-				C690CCB22757674700609077 /* GenericViews */,
-				C6EA2F5E2754CFB0008E60F8 /* TimestampUtils.swift */,
 				C683B211272276C100D4E15C /* Extensions */,
 				C65A5D3427216CAB005BA038 /* ViewModel */,
 			);
@@ -3380,16 +3330,10 @@
 			isa = PBXGroup;
 			children = (
 				C6710F582722A9B800ED888F /* StyledLabel.swift */,
-				C6DB1DE32758E49E00A22704 /* StyledSwitch.swift */,
-				C6DB1DE5275903C500A22704 /* StyledDatePicker.swift */,
-				C6DB1DE72759136000A22704 /* StyledValuePicker.swift */,
-				C6D1E42027593A30008EB388 /* StyledCheckBox.swift */,
-				C6DB1DE12757E35F00A22704 /* StyledTextView.swift */,
 				C6710FD82722BD0100ED888F /* UICallTimer.swift */,
 				C6710F4E2722903200ED888F /* RotatingSpinner.swift */,
 				C6710FE02722F0E400ED888F /* Avatar.swift */,
 				C6710FE82723DD7D00ED888F /* CallControlButton.swift */,
-				C61E409E275A962100CCE602 /* FormButton.swift */,
 				C658614B273E5B5E00A0DBFC /* VoipExtraButton.swift */,
 				C6D09F3C273EE467003C2173 /* BouncingCounter.swift */,
 				C6F2D502273BAC030071BA52 /* ButtonWithStateBackgrounds.swift */,
@@ -3451,8 +3395,6 @@
 				C60D265B272AA0BD006238BB /* UIImageExtensions.swift */,
 				C6710FDB2722C3BB00ED888F /* UIVIewExtensions.swift */,
 				C6C65E88272723DC00E48FC6 /* UIVIewControllerExtensions.swift */,
-				C61E409C275A94E300CCE602 /* UILabelExtensions.swift */,
-				C6D1E41A275937A0008EB388 /* UIButtonExtensions.swift */,
 			);
 			path = IOS;
 			sourceTree = "<group>";
@@ -3507,14 +3449,6 @@
 			path = Extensions;
 			sourceTree = "<group>";
 		};
-		C690CCB22757674700609077 /* GenericViews */ = {
-			isa = PBXGroup;
-			children = (
-				C690CCB32757683800609077 /* NavigationView.swift */,
-			);
-			path = GenericViews;
-			sourceTree = "<group>";
-		};
 		C6D52B4727481D3F00904660 /* Conference */ = {
 			isa = PBXGroup;
 			children = (
@@ -3527,43 +3461,6 @@
 			path = Conference;
 			sourceTree = "<group>";
 		};
-		C6EA2F492752237C008E60F8 /* Conference */ = {
-			isa = PBXGroup;
-			children = (
-				C6EA2F4C2754C691008E60F8 /* data */,
-				C6EA2F4B2754C683008E60F8 /* views */,
-				C6EA2F4D2754C69F008E60F8 /* viewmodels */,
-			);
-			path = Conference;
-			sourceTree = "<group>";
-		};
-		C6EA2F4B2754C683008E60F8 /* views */ = {
-			isa = PBXGroup;
-			children = (
-				C690CCB0275764CD00609077 /* ConferenceSchedulingView.swift */,
-				C61E409A275A20A300CCE602 /* ConferenceSchedulingSummaryView.swift */,
-			);
-			path = views;
-			sourceTree = "<group>";
-		};
-		C6EA2F4C2754C691008E60F8 /* data */ = {
-			isa = PBXGroup;
-			children = (
-				C6EA2F6A2754DDF9008E60F8 /* Duration.swift */,
-				C6EA2F622754DBBE008E60F8 /* TimeZoneData.swift */,
-				C6EA2F582754C91C008E60F8 /* ScheduledConferenceData.swift */,
-			);
-			path = data;
-			sourceTree = "<group>";
-		};
-		C6EA2F4D2754C69F008E60F8 /* viewmodels */ = {
-			isa = PBXGroup;
-			children = (
-				C6EA2F662754DC45008E60F8 /* ConferenceSchedulingViewModel.swift */,
-			);
-			path = viewmodels;
-			sourceTree = "<group>";
-		};
 		D326483415887D4400930C67 /* Utils */ = {
 			isa = PBXGroup;
 			children = (
@@ -4182,7 +4079,6 @@
 				633FEDFD1D3CD5590014B822 /* camera_switch_default@2x.png in Resources */,
 				633FEEC51D3CD55A0014B822 /* numpad_5_over.png in Resources */,
 				633FEE721D3CD5590014B822 /* history_all_default.png in Resources */,
-				C6D1E42527595988008EB388 /* security_toggle_icon_green.png in Resources */,
 				C6B4444326AAD0980076C517 /* file_default.png in Resources */,
 				615A283C2180789C0060F920 /* security_toogle_button@2x.png in Resources */,
 				633FEF0A1D3CD55A0014B822 /* options_transfer_call_default.png in Resources */,
@@ -4345,7 +4241,6 @@
 				633FEDF01D3CD5590014B822 /* call_transfer_disabled.png in Resources */,
 				633FEE351D3CD5590014B822 /* conference_exit_default@2x.png in Resources */,
 				C6710FCB2722B20000ED888F /* voip_remote_recording.png in Resources */,
-				C6D1E42427595988008EB388 /* security_toggle_icon_grey.png in Resources */,
 				C6710FAA2722B20000ED888F /* voip_conference_active_speaker.png in Resources */,
 				633FEECF1D3CD55A0014B822 /* numpad_6_over~ipad.png in Resources */,
 				61586B87217A17160038AC45 /* menu_assistant@2x.png in Resources */,
@@ -4358,7 +4253,6 @@
 				C6710FD62722B20000ED888F /* voip_conference_play_big.png in Resources */,
 				633FEDCA1D3CD5590014B822 /* call_outgoing.png in Resources */,
 				633FEDF81D3CD5590014B822 /* camera_disabled.png in Resources */,
-				C6D1E41F2759396B008EB388 /* voip_checkbox_checked.png in Resources */,
 				C6710FBD2722B20000ED888F /* voip_call_header_paused.png in Resources */,
 				8CB2B8FB1F86229E0015CEE2 /* next_disabled@2x.png in Resources */,
 				633FEEE91D3CD55A0014B822 /* numpad_9~ipad.png in Resources */,
@@ -4385,7 +4279,6 @@
 				633FEDE41D3CD5590014B822 /* call_status_incoming~ipad.png in Resources */,
 				633FEE4C1D3CD5590014B822 /* delete_field_default.png in Resources */,
 				633FEE391D3CD5590014B822 /* contact_add_default@2x.png in Resources */,
-				C6D1E41E2759396B008EB388 /* voip_checkbox_unchecked.png in Resources */,
 				633FEE741D3CD5590014B822 /* history_all_disabled.png in Resources */,
 				633FEE081D3CD5590014B822 /* chat_add_disabled.png in Resources */,
 				615A28422180C0870060F920 /* recording.png in Resources */,
@@ -4768,8 +4661,6 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-linphone/Pods-linphone-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/DropDown/DropDown.framework",
-				"${BUILT_PRODUCTS_DIR}/IQKeyboardManager/IQKeyboardManager.framework",
 				"${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework",
 				"${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework",
 				"${PODS_ROOT}/../../../../../../../Volumes/dada/bc/linphone-sdk/ios/linphone-sdk/apple-darwin/Frameworks/bctoolbox-ios.framework",
@@ -4792,8 +4683,6 @@
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DropDown.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IQKeyboardManager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SVProgressHUD.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/bctoolbox-ios.framework",
@@ -4844,14 +4733,12 @@
 				C6710F5527229D5900ED888F /* LightDarkColor.swift in Sources */,
 				C6F2D4F9273A4CD70071BA52 /* SharedLayoutConstants.swift in Sources */,
 				C6D09F3F274273FB003C2173 /* CallStatsView.swift in Sources */,
-				C6EA2F632754DBBE008E60F8 /* TimeZoneData.swift in Sources */,
 				22F2508E107141E100AC9B3F /* DialerView.m in Sources */,
 				633756451B67D2B200E21BAD /* SideMenuView.m in Sources */,
 				C6F2D4F1273935860071BA52 /* CallExtensions.swift in Sources */,
 				C6710F5C2722AAED00ED888F /* UIDeviceExtensions.swift in Sources */,
 				C65A5D3027216B86005BA038 /* ActiveCallOrConferenceView.swift in Sources */,
 				8CD99A422090CE6F008A7CDA /* UIChatConversationImdnTableViewCell.m in Sources */,
-				C6D1E42127593A30008EB388 /* StyledCheckBox.swift in Sources */,
 				22E0A822111C44E100B04932 /* AboutView.m in Sources */,
 				633671611BCBAAD200BFCBDE /* ChatConversationCreateView.m in Sources */,
 				634610061B61330300548952 /* UILabel+Boldify.m in Sources */,
@@ -4861,8 +4748,6 @@
 				C6B04D63274B95D500F70559 /* VoipParticipantCell.swift in Sources */,
 				2214EB7A12F846B1002A5394 /* UICallButton.m in Sources */,
 				C683B213272276CF00D4E15C /* UIColorExtensions.swift in Sources */,
-				C61E409F275A962100CCE602 /* FormButton.swift in Sources */,
-				C690CCB1275764CD00609077 /* ConferenceSchedulingView.swift in Sources */,
 				C6710F512722932600ED888F /* UIImageViewExtensions.swift in Sources */,
 				630CF5571AF7CE1500539F7A /* UITextField+DoneButton.m in Sources */,
 				2214EBF312F86360002A5394 /* UIMutedMicroButton.m in Sources */,
@@ -4884,8 +4769,6 @@
 				6377AC801BDE4069007F7625 /* UIBackToCallButton.m in Sources */,
 				C6D09F43274288D4003C2173 /* PayloadType.swift in Sources */,
 				6308F9C51BF0DD6600D1234B /* XMLRPCHelper.m in Sources */,
-				C6EA2F5F2754CFB0008E60F8 /* TimestampUtils.swift in Sources */,
-				C6DB1DE82759136100A22704 /* StyledValuePicker.swift in Sources */,
 				C6F2D4F72739861F0071BA52 /* RemotelyRecording.swift in Sources */,
 				D3ED3E871586291E006C0DE4 /* TabBarView.m in Sources */,
 				617C242A263022690042FB4A /* UIChatContentView.m in Sources */,
@@ -4901,7 +4784,6 @@
 				D35498211587716B000081D8 /* StatusBarView.m in Sources */,
 				D3A55FBC15877E5E003FD403 /* UIContactCell.m in Sources */,
 				6341807C1BBC103100F71761 /* ChatConversationCreateTableView.m in Sources */,
-				C6DB1DE42758E49E00A22704 /* StyledSwitch.swift in Sources */,
 				63BE7A781D75BDF6000990EF /* ShopTableView.m in Sources */,
 				D326483815887D5200930C67 /* OrderedDictionary.m in Sources */,
 				C6710F4F2722903200ED888F /* RotatingSpinner.swift in Sources */,
@@ -4912,7 +4794,6 @@
 				C6C98CD527453ED900059B55 /* ConferenceViewModel.swift in Sources */,
 				D31C9C98158A1CDF00756B45 /* UIHistoryCell.m in Sources */,
 				D35E7597159460580066B1C1 /* ChatsListView.m in Sources */,
-				C6EA2F6D2754E3DC008E60F8 /* MediatorLiveData.swift in Sources */,
 				D35E759F159460B70066B1C1 /* SettingsView.m in Sources */,
 				63B81A101B57DA33009604A6 /* UIScrollView+TPKeyboardAvoidingAdditions.m in Sources */,
 				F03CA84318C72F1A0008889D /* UITextViewNoDefine.m in Sources */,
@@ -4936,7 +4817,6 @@
 				8C9C5E0D1F83B2EF006987FA /* ChatConversationCreateCollectionViewController.m in Sources */,
 				631098491D4660580041F2B3 /* CountryListView.m in Sources */,
 				D32B9DFC15A2F131000B6DEC /* FastAddressBook.m in Sources */,
-				C6DB1DE22757E35F00A22704 /* StyledTextView.swift in Sources */,
 				D350F20E15A43BB100149E54 /* AssistantView.m in Sources */,
 				D3F795D615A582810077328B /* ChatConversationView.m in Sources */,
 				C60D265627299C94006238BB /* ControlsViewModel.swift in Sources */,
@@ -4951,10 +4831,8 @@
 				C6B04D67274BD61300F70559 /* VoipConferenceActiveSpeakerView.swift in Sources */,
 				D37C639B15AADEF6009D0BAC /* ContactDetailsTableView.m in Sources */,
 				63E59A3F1ADE70D900646FB3 /* InAppProductsManager.m in Sources */,
-				C6DB1DE6275903C500A22704 /* StyledDatePicker.swift in Sources */,
 				C67C97B8274FD76B0074A0D8 /* AudioRouteUtils.swift in Sources */,
 				C6C98CE1274568F800059B55 /* VoipConferenceGridView.swift in Sources */,
-				C61E409B275A20A300CCE602 /* ConferenceSchedulingSummaryView.swift in Sources */,
 				D3C6526715AC1A8F0092A874 /* UIContactDetailsCell.m in Sources */,
 				631348301B6F7B6600C6BDCB /* UIRoundBorderedButton.m in Sources */,
 				C90FAA7915AF54E6002091CB /* HistoryDetailsView.m in Sources */,
@@ -4967,7 +4845,6 @@
 				D35860D615B549B500513429 /* Utils.m in Sources */,
 				D3F7998115BD32370018C273 /* TPMultiLayoutViewController.m in Sources */,
 				D3807FBF15C28940005BE9BC /* DCRoundSwitch.m in Sources */,
-				C61E409D275A94E300CCE602 /* UILabelExtensions.swift in Sources */,
 				D3807FC115C28940005BE9BC /* DCRoundSwitchKnobLayer.m in Sources */,
 				C6B04D61274B954500F70559 /* ParticipantsListView.swift in Sources */,
 				61CCC3DF21933B580060EDEA /* UIDeviceCell.m in Sources */,
@@ -4981,7 +4858,6 @@
 				D3807FE815C2894A005BE9BC /* IASKAppSettingsViewController.m in Sources */,
 				D3807FEC15C2894A005BE9BC /* IASKSpecifierValuesViewController.m in Sources */,
 				8CA70AE41F9E39E400A3D2EB /* UIChatConversationInfoTableViewCell.m in Sources */,
-				C690CCB42757683800609077 /* NavigationView.swift in Sources */,
 				D3807FEE15C2894A005BE9BC /* IASKSettingsReader.m in Sources */,
 				C6C65E8B2727274A00E48FC6 /* NumpadView.swift in Sources */,
 				C6F2D501273B0EFC0071BA52 /* VoipDialog.swift in Sources */,
@@ -4999,11 +4875,8 @@
 				D3807FF615C2894A005BE9BC /* IASKSpecifier.m in Sources */,
 				C6710FE92723DD7D00ED888F /* CallControlButton.swift in Sources */,
 				D3807FF815C2894A005BE9BC /* IASKPSSliderSpecifierViewCell.m in Sources */,
-				C6EA2F592754C91C008E60F8 /* ScheduledConferenceData.swift in Sources */,
-				C6EA2F672754DC45008E60F8 /* ConferenceSchedulingViewModel.swift in Sources */,
 				D3807FFA15C2894A005BE9BC /* IASKPSTextFieldSpecifierViewCell.m in Sources */,
 				D3807FFC15C2894A005BE9BC /* IASKPSTitleValueSpecifierViewCell.m in Sources */,
-				C6D1E41B275937A0008EB388 /* UIButtonExtensions.swift in Sources */,
 				C6F2D4EF27392D970071BA52 /* CallsViewModel.swift in Sources */,
 				C6C65E89272723DC00E48FC6 /* UIVIewControllerExtensions.swift in Sources */,
 				D3807FFE15C2894A005BE9BC /* IASKSlider.m in Sources */,
@@ -5016,7 +4889,6 @@
 				C6C98CDB274541E400059B55 /* ConferenceParticipantDeviceData.swift in Sources */,
 				637157A11B283FE200C91677 /* FileTransferDelegate.m in Sources */,
 				C6710FDE2722D44B00ED888F /* IncomingOuntgoingCommonView.swift in Sources */,
-				C6EA2F6B2754DDF9008E60F8 /* Duration.swift in Sources */,
 				D378AB2A15DCDB4A0098505D /* ImagePickerView.m in Sources */,
 				C6710F592722A9B800ED888F /* StyledLabel.swift in Sources */,
 				22405F001601C19200B92522 /* ImageView.m in Sources */,
@@ -5604,7 +5476,7 @@
 					"-DENABLE_QRCODE=TRUE",
 					"-DENABLE_SMS_INVITE=TRUE",
 					"$(inherited)",
-					"-DLINPHONE_SDK_VERSION=\\\"5.2.0-alpha.36+bd3b432\\\"",
+					"-DLINPHONE_SDK_VERSION=\\\"5.2.0-alpha.20+3cffbc5\\\"",
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone;
@@ -5731,7 +5603,7 @@
 					"-DENABLE_QRCODE=TRUE",
 					"-DENABLE_SMS_INVITE=TRUE",
 					"$(inherited)",
-					"-DLINPHONE_SDK_VERSION=\\\"5.2.0-alpha.36+bd3b432\\\"",
+					"-DLINPHONE_SDK_VERSION=\\\"5.2.0-alpha.20+3cffbc5\\\"",
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone;
@@ -5857,7 +5729,7 @@
 					"-DENABLE_QRCODE=TRUE",
 					"-DENABLE_SMS_INVITE=TRUE",
 					"$(inherited)",
-					"-DLINPHONE_SDK_VERSION=\\\"5.2.0-alpha.36+bd3b432\\\"",
+					"-DLINPHONE_SDK_VERSION=\\\"5.2.0-alpha.20+3cffbc5\\\"",
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone;
@@ -5982,7 +5854,7 @@
 					"-DENABLE_QRCODE=TRUE",
 					"-DENABLE_SMS_INVITE=TRUE",
 					"$(inherited)",
-					"-DLINPHONE_SDK_VERSION=\\\"5.2.0-alpha.36+bd3b432\\\"",
+					"-DLINPHONE_SDK_VERSION=\\\"5.2.0-alpha.20+3cffbc5\\\"",
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone;