diff --git a/.tx/config b/.tx/config
index fd0a25139..c5145ec27 100644
--- a/.tx/config
+++ b/.tx/config
@@ -212,12 +212,17 @@ source_lang = en
 file_filter = Settings/InAppSettings.bundle/<lang>.lproj/Video.strings
 source_file = Settings/InAppSettings.bundle/en.lproj/Video.strings
 
-[linphone-ios.countrylistviewcontrollerstrings]
-source_lang = en
-file_filter = Classes/<lang>.lproj/CountryListViewController.strings
-source_file = Classes/Base.lproj/CountryListViewController.strings
-
 [linphone-ios.shopviewstrings]
 source_lang = en
 file_filter = Classes/<lang>.lproj/ShopView.strings
 source_file = Classes/en.lproj/ShopView.strings
+
+[linphone-ios.assistantlinkviewstrings]
+source_lang = en
+file_filter = Classes/<lang>.lproj/AssistantLinkView.strings
+source_file = Classes/Base.lproj/AssistantLinkView.strings
+
+[linphone-ios.countrylistviewstrings]
+source_lang = en
+file_filter = Classes/<lang>.lproj/CountryListView.strings
+source_file = Classes/Base.lproj/CountryListView.strings
diff --git a/Classes/Base.lproj/AssistantLinkView.strings b/Classes/Base.lproj/AssistantLinkView.strings
new file mode 100644
index 000000000..2be816fe5
Binary files /dev/null and b/Classes/Base.lproj/AssistantLinkView.strings differ
diff --git a/Classes/Base.lproj/AssistantViewScreens.strings b/Classes/Base.lproj/AssistantViewScreens.strings
index 9a2281895..919ec41e2 100644
Binary files a/Classes/Base.lproj/AssistantViewScreens.strings and b/Classes/Base.lproj/AssistantViewScreens.strings differ
diff --git a/Classes/Base.lproj/ContactDetailsView.xib b/Classes/Base.lproj/ContactDetailsView.xib
index ffd4d1788..ff6c31804 100644
--- a/Classes/Base.lproj/ContactDetailsView.xib
+++ b/Classes/Base.lproj/ContactDetailsView.xib
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11198.2" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="NO">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <development version="7000" identifier="xcode"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ContactDetailsView">
@@ -23,28 +24,28 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="XnN-PU-Vk7" userLabel="iphone6MetricsView">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" id="1">
-                    <rect key="frame" x="0.0" y="42" width="375" height="559"/>
+                    <rect key="frame" x="0.0" y="42" width="320" height="372"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
                         <view tag="1" contentMode="scaleToFill" id="4" userLabel="topBar">
-                            <rect key="frame" x="0.0" y="0.0" width="375" height="66"/>
+                            <rect key="frame" x="0.0" y="0.0" width="320" height="66"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <imageView userInteractionEnabled="NO" tag="2" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="Lb6-xa-LB6" userLabel="backgroundColor">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="66"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                 </imageView>
                                 <button hidden="YES" opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="bPQ-aJ-Lk6" userLabel="cancelButton" customClass="UIIconButton">
-                                    <rect key="frame" x="0.0" y="0.0" width="75" height="66"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="64" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Delete all"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
                                     <state key="normal" image="cancel_edit_default.png">
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <state key="disabled" image="cancel_edit_disabled.png"/>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
@@ -53,14 +54,14 @@
                                     </connections>
                                 </button>
                                 <button opaque="NO" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="9" userLabel="backButton" customClass="UIIconButton">
-                                    <rect key="frame" x="0.0" y="0.0" width="75" height="66"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="64" 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"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
                                     <state key="normal" image="back_default.png">
-                                        <color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="titleColor" red="0.28619974851608276" green="0.32144349813461304" blue="0.35980013012886047" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <state key="disabled" image="back_disabled.png"/>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
@@ -69,14 +70,14 @@
                                     </connections>
                                 </button>
                                 <button opaque="NO" tag="5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="MuB-yy-R9o" userLabel="deleteButton" customClass="UIToggleButton">
-                                    <rect key="frame" x="225" y="0.0" width="75" height="66"/>
+                                    <rect key="frame" x="192" y="0.0" width="64" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Delete"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
                                     <state key="normal" image="delete_default.png">
-                                        <color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="titleColor" red="0.28619974851608276" green="0.32144349813461304" blue="0.35980013012886047" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <state key="disabled" image="delete_disabled.png"/>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
@@ -85,14 +86,14 @@
                                     </connections>
                                 </button>
                                 <button opaque="NO" tag="6" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="8" userLabel="editButton" customClass="UIToggleButton">
-                                    <rect key="frame" x="300" y="0.0" width="75" height="66"/>
+                                    <rect key="frame" x="256" y="0.0" width="64" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Edit"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
                                     <state key="normal" image="edit_default.png">
-                                        <color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="titleColor" red="0.28619974851608276" green="0.32144349813461304" blue="0.35980013012886047" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <state key="disabled" image="edit_disabled.png"/>
                                     <state key="selected" image="valid_default.png"/>
@@ -104,27 +105,27 @@
                             </subviews>
                         </view>
                         <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" tag="7" contentMode="scaleToFill" directionalLockEnabled="YES" showsHorizontalScrollIndicator="NO" id="8D6-vy-obt" userLabel="contentView">
-                            <rect key="frame" x="0.0" y="66" width="375" height="493"/>
+                            <rect key="frame" x="0.0" y="66" width="320" height="306"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <imageView tag="8" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="avatar.png" id="B6X-C9-2vm" userLabel="avatarImage" customClass="UIRoundedImageView">
-                                    <rect key="frame" x="142" y="10" width="90" height="90"/>
+                                    <rect key="frame" x="115" y="10" width="90" height="90"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <connections>
                                         <outletCollection property="gestureRecognizers" destination="8bV-f4-pLL" appends="YES" id="4V5-Px-aHT"/>
                                     </connections>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" tag="9" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="John Doe" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="moZ-Bg-zcv" userLabel="nameLabel">
-                                    <rect key="frame" x="0.0" y="108" width="375" height="40"/>
+                                    <rect key="frame" x="0.0" y="108" width="320" height="40"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="27"/>
                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <tableView clipsSubviews="YES" tag="10" contentMode="scaleToFill" directionalLockEnabled="YES" alwaysBounceVertical="YES" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" style="plain" allowsSelection="NO" allowsSelectionDuringEditing="YES" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="1" sectionFooterHeight="1" id="19" userLabel="tableView">
-                                    <rect key="frame" x="0.0" y="156" width="375" height="337"/>
+                                <tableView clipsSubviews="YES" tag="10" contentMode="scaleToFill" directionalLockEnabled="YES" alwaysBounceVertical="YES" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" style="plain" allowsSelection="NO" allowsSelectionDuringEditing="YES" rowHeight="44" sectionHeaderHeight="1" sectionFooterHeight="1" id="19" userLabel="tableView">
+                                    <rect key="frame" x="0.0" y="156" width="320" height="150"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                     <inset key="contentInset" minX="0.0" minY="0.0" maxX="0.0" maxY="10"/>
                                     <inset key="scrollIndicatorInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="10"/>
                                     <connections>
@@ -135,19 +136,18 @@
                             </subviews>
                         </scrollView>
                         <label hidden="YES" opaque="NO" userInteractionEnabled="NO" tag="40" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No contact selected" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Mdj-Pz-nu4" userLabel="emptyLabel">
-                            <rect key="frame" x="0.0" y="66" width="375" height="493"/>
+                            <rect key="frame" x="0.0" y="66" width="320" height="306"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                     </subviews>
-                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                 </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-            <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
             <point key="canvasLocation" x="-436.5" y="192.5"/>
         </view>
         <view contentMode="scaleToFill" id="gnD-7x-PSh" userLabel="iphone6MetricsView">
@@ -172,7 +172,7 @@
                                     <accessibility key="accessibilityConfiguration" label="Delete all"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
                                     <state key="normal" image="cancel_edit_default.png">
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <state key="disabled" image="cancel_edit_disabled.png"/>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
@@ -187,8 +187,8 @@
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
                                     <state key="normal" image="back_default.png">
-                                        <color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="titleColor" red="0.28619974851608276" green="0.32144349813461304" blue="0.35980013012886047" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <state key="disabled" image="back_disabled.png"/>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
@@ -203,8 +203,8 @@
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
                                     <state key="normal" image="delete_default.png">
-                                        <color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="titleColor" red="0.28619974851608276" green="0.32144349813461304" blue="0.35980013012886047" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <state key="disabled" image="delete_disabled.png"/>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
@@ -219,8 +219,8 @@
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
                                     <state key="normal" image="edit_default.png">
-                                        <color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="titleColor" red="0.28619974851608276" green="0.32144349813461304" blue="0.35980013012886047" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <state key="disabled" image="edit_disabled.png"/>
                                     <state key="selected" image="valid_default.png"/>
@@ -246,10 +246,10 @@
                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <tableView clipsSubviews="YES" tag="10" contentMode="scaleToFill" directionalLockEnabled="YES" alwaysBounceVertical="YES" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" style="plain" allowsSelection="NO" allowsSelectionDuringEditing="YES" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="1" sectionFooterHeight="1" id="WMA-Yo-NbI" userLabel="tableView" customClass="TPKeyboardAvoidingTableView">
+                                <tableView clipsSubviews="YES" tag="10" contentMode="scaleToFill" directionalLockEnabled="YES" alwaysBounceVertical="YES" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" style="plain" allowsSelection="NO" allowsSelectionDuringEditing="YES" rowHeight="44" sectionHeaderHeight="1" sectionFooterHeight="1" id="WMA-Yo-NbI" userLabel="tableView" customClass="TPKeyboardAvoidingTableView">
                                     <rect key="frame" x="0.0" y="84" width="667" height="183"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                     <inset key="contentInset" minX="0.0" minY="0.0" maxX="0.0" maxY="10"/>
                                     <inset key="scrollIndicatorInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="10"/>
                                     <connections>
@@ -262,17 +262,16 @@
                         <label hidden="YES" opaque="NO" userInteractionEnabled="NO" tag="40" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No contact selected" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="oFA-SG-IDe" userLabel="emptyLabel">
                             <rect key="frame" x="0.0" y="66" width="667" height="267"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                     </subviews>
-                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                 </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-            <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <point key="canvasLocation" x="25.5" y="275.5"/>
         </view>
@@ -290,17 +289,22 @@
         </tapGestureRecognizer>
     </objects>
     <resources>
-        <image name="avatar.png" width="255" height="255"/>
-        <image name="back_default.png" width="24" height="21"/>
-        <image name="back_disabled.png" width="24" height="21"/>
+        <image name="avatar.png" width="259" height="259"/>
+        <image name="back_default.png" width="24" height="22"/>
+        <image name="back_disabled.png" width="24" height="22"/>
         <image name="cancel_edit_default.png" width="29" height="29"/>
         <image name="cancel_edit_disabled.png" width="29" height="29"/>
         <image name="color_E.png" width="2" height="2"/>
         <image name="color_F.png" width="2" height="2"/>
-        <image name="delete_default.png" width="21" height="27"/>
-        <image name="delete_disabled.png" width="21" height="27"/>
-        <image name="edit_default.png" width="28" height="28"/>
-        <image name="edit_disabled.png" width="28" height="28"/>
-        <image name="valid_default.png" width="27" height="19"/>
+        <image name="delete_default.png" width="21" height="28"/>
+        <image name="delete_disabled.png" width="21" height="28"/>
+        <image name="edit_default.png" width="29" height="29"/>
+        <image name="edit_disabled.png" width="29" height="29"/>
+        <image name="valid_default.png" width="28" height="19"/>
     </resources>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination"/>
+    </simulatedMetricsContainer>
 </document>
diff --git a/Classes/Base.lproj/ContactsListView.xib b/Classes/Base.lproj/ContactsListView.xib
index 07a46be74..21cf61441 100644
--- a/Classes/Base.lproj/ContactsListView.xib
+++ b/Classes/Base.lproj/ContactsListView.xib
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11198.2" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="NO">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
+        <development version="7000" identifier="xcode"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ContactsListView">
@@ -19,7 +20,7 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="1YR-9t-hRk" userLabel="iphone6MetricsView">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" id="2">
@@ -33,7 +34,6 @@
                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="Ehd-EB-dCJ" userLabel="backgroundColor">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
-                                    <animations/>
                                 </imageView>
                                 <view contentMode="scaleToFill" id="93" userLabel="switchView">
                                     <rect key="frame" x="0.0" y="0.0" width="150" height="66"/>
@@ -42,18 +42,17 @@
                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="4" userLabel="allButton" customClass="UIIconButton">
                                             <rect key="frame" x="0.0" y="0.0" width="75" height="66"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
-                                            <animations/>
                                             <accessibility key="accessibilityConfiguration" label="All contacts filter"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="9"/>
                                             <inset key="titleEdgeInsets" minX="-38" minY="15" maxX="0.0" maxY="0.0"/>
                                             <inset key="imageEdgeInsets" minX="16" minY="0.0" maxX="0.0" maxY="0.0"/>
                                             <state key="normal" image="contacts_all_default.png">
-                                                <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                                <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="calibratedRGB"/>
                                             </state>
                                             <state key="disabled" image="contacts_all_disabled.png"/>
                                             <state key="selected" image="contacts_all_selected.png">
-                                                <color key="titleColor" red="1" green="0.36862745099999999" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <color key="titleColor" red="0.98766469955444336" green="0.27512490749359131" blue="0.029739789664745331" alpha="1" colorSpace="calibratedRGB"/>
                                             </state>
                                             <state key="highlighted" backgroundImage="color_E.png"/>
                                             <connections>
@@ -63,21 +62,19 @@
                                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_A.png" id="A9k-KU-Dlm" userLabel="selectedButtonImage">
                                             <rect key="frame" x="0.0" y="63" width="75" height="3"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
-                                            <animations/>
                                         </imageView>
                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="5" userLabel="sipButton" customClass="UIIconButton">
                                             <rect key="frame" x="75" y="0.0" width="75" height="66"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/>
-                                            <animations/>
                                             <accessibility key="accessibilityConfiguration" label="Linphone contacts filter"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="9"/>
                                             <state key="normal" image="contacts_sip_default.png">
-                                                <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                                <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="calibratedRGB"/>
                                             </state>
                                             <state key="disabled" image="contacts_sip_disabled.png"/>
                                             <state key="selected" image="contacts_sip_selected.png">
-                                                <color key="titleColor" red="1" green="0.36862745099999999" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <color key="titleColor" red="0.98766469955444336" green="0.27512490749359131" blue="0.029739789664745331" alpha="1" colorSpace="calibratedRGB"/>
                                             </state>
                                             <state key="highlighted" backgroundImage="color_E.png"/>
                                             <connections>
@@ -85,15 +82,13 @@
                                             </connections>
                                         </button>
                                     </subviews>
-                                    <animations/>
                                 </view>
                                 <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="MZP-cb-ntf" userLabel="cancelButton" customClass="UIIconButton">
                                     <rect key="frame" x="0.0" y="0.0" width="75" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
-                                    <animations/>
                                     <accessibility key="accessibilityConfiguration" label="Delete all"/>
                                     <state key="normal" image="cancel_edit_default.png">
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <state key="disabled" image="cancel_edit_disabled.png"/>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
@@ -105,11 +100,10 @@
                                 <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="tFB-Vf-lUX" userLabel="deleteButton" customClass="UIIconButton">
                                     <rect key="frame" x="300" y="0.0" width="75" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
-                                    <animations/>
                                     <accessibility key="accessibilityConfiguration" label="Delete all"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
                                     <state key="normal" image="delete_default.png">
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <state key="disabled" image="delete_disabled.png"/>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
@@ -120,11 +114,10 @@
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="DZc-zR-1Q7" userLabel="editButton" customClass="UIIconButton">
                                     <rect key="frame" x="300" y="0.0" width="75" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
-                                    <animations/>
                                     <accessibility key="accessibilityConfiguration" label="Edit"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
                                     <state key="normal" image="edit_list_default.png">
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <state key="disabled" image="edit_list_disabled.png"/>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
@@ -136,12 +129,11 @@
                                 <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="5lZ-u7-Yex" userLabel="toggleSelectionButton" customClass="UIIconButton">
                                     <rect key="frame" x="225" y="0.0" width="75" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
-                                    <animations/>
                                     <accessibility key="accessibilityConfiguration" label="Select all"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
                                     <state key="normal" image="deselect_all.png">
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <state key="disabled" image="select_all_disabled.png"/>
                                     <state key="selected" image="select_all_default.png"/>
@@ -153,11 +145,10 @@
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="6" userLabel="addButton" customClass="UIIconButton">
                                     <rect key="frame" x="225" y="0.0" width="75" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
-                                    <animations/>
                                     <accessibility key="accessibilityConfiguration" label="Add contact"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
                                     <state key="normal" image="contact_add_default.png">
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="calibratedRGB"/>
                                     </state>
                                     <state key="disabled" image="contact_add_disabled.png"/>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
@@ -166,12 +157,10 @@
                                     </connections>
                                 </button>
                             </subviews>
-                            <animations/>
                         </view>
                         <searchBar contentMode="redraw" showsCancelButton="YES" id="5jE-oF-d45" userLabel="searchBar">
                             <rect key="frame" x="0.0" y="66" width="375" height="44"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <animations/>
                             <textInputTraits key="textInputTraits"/>
                             <connections>
                                 <outlet property="delegate" destination="-1" id="Fk3-Tl-dY0"/>
@@ -180,32 +169,27 @@
                         <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" allowsSelectionDuringEditing="YES" allowsMultipleSelectionDuringEditing="YES" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="zOo-FS-W6l" userLabel="tableView">
                             <rect key="frame" x="0.0" y="110" width="375" height="449"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                            <animations/>
-                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             <inset key="contentInset" minX="0.0" minY="0.0" maxX="0.0" maxY="10"/>
                             <inset key="scrollIndicatorInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="10"/>
-                            <color key="separatorColor" red="0.7254902124" green="0.76862746479999999" blue="0.79607844350000001" alpha="1" colorSpace="deviceRGB"/>
+                            <color key="separatorColor" red="0.67030966281890869" green="0.71867996454238892" blue="0.75078284740447998" alpha="1" colorSpace="calibratedRGB"/>
                             <connections>
                                 <outlet property="dataSource" destination="TJG-JZ-YRR" id="334-RR-jEi"/>
                                 <outlet property="delegate" destination="TJG-JZ-YRR" id="V1N-gI-U4J"/>
                             </connections>
                         </tableView>
-                        <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No contact found in your address book" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JR3-k7-gVP" userLabel="emptyTableLabel">
+                        <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No contact found in your address book" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JR3-k7-gVP" userLabel="emptyTableLabel">
                             <rect key="frame" x="0.0" y="110" width="375" height="449"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                            <animations/>
-                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                     </subviews>
-                    <animations/>
                 </view>
             </subviews>
-            <animations/>
             <color key="backgroundColor" red="1" green="1" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-            <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
             <point key="canvasLocation" x="4.5" y="212.5"/>
         </view>
         <tableViewController id="TJG-JZ-YRR" userLabel="tableController" customClass="ContactsListTableView">
@@ -231,15 +215,20 @@
         <image name="contacts_all_default.png" width="32" height="27"/>
         <image name="contacts_all_disabled.png" width="32" height="27"/>
         <image name="contacts_all_selected.png" width="32" height="27"/>
-        <image name="contacts_sip_default.png" width="38" height="29"/>
-        <image name="contacts_sip_disabled.png" width="38" height="29"/>
-        <image name="contacts_sip_selected.png" width="38" height="29"/>
-        <image name="delete_default.png" width="21" height="27"/>
-        <image name="delete_disabled.png" width="21" height="27"/>
-        <image name="deselect_all.png" width="26" height="26"/>
-        <image name="edit_list_default.png" width="29" height="28"/>
-        <image name="edit_list_disabled.png" width="29" height="28"/>
-        <image name="select_all_default.png" width="26" height="26"/>
-        <image name="select_all_disabled.png" width="26" height="26"/>
+        <image name="contacts_sip_default.png" width="38" height="30"/>
+        <image name="contacts_sip_disabled.png" width="38" height="30"/>
+        <image name="contacts_sip_selected.png" width="38" height="30"/>
+        <image name="delete_default.png" width="21" height="28"/>
+        <image name="delete_disabled.png" width="21" height="28"/>
+        <image name="deselect_all.png" width="27" height="27"/>
+        <image name="edit_list_default.png" width="30" height="28"/>
+        <image name="edit_list_disabled.png" width="30" height="28"/>
+        <image name="select_all_default.png" width="27" height="27"/>
+        <image name="select_all_disabled.png" width="27" height="27"/>
     </resources>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination"/>
+    </simulatedMetricsContainer>
 </document>
diff --git a/Classes/Base.lproj/CountryListViewController.strings b/Classes/Base.lproj/CountryListView.strings
similarity index 100%
rename from Classes/Base.lproj/CountryListViewController.strings
rename to Classes/Base.lproj/CountryListView.strings
diff --git a/Classes/Base.lproj/ShopView.strings b/Classes/Base.lproj/ShopView.strings
index dccbac9ea..a5c86efab 100644
Binary files a/Classes/Base.lproj/ShopView.strings and b/Classes/Base.lproj/ShopView.strings differ
diff --git a/Classes/LinphoneUI/TabBarView.m b/Classes/LinphoneUI/TabBarView.m
index 49478bcdf..4d704fc93 100644
--- a/Classes/LinphoneUI/TabBarView.m
+++ b/Classes/LinphoneUI/TabBarView.m
@@ -147,7 +147,6 @@
 
 - (IBAction)onContactsClick:(id)event {
 	[ContactSelection setAddAddress:nil];
-	[ContactSelection setSipFilter:nil];
 	[ContactSelection enableEmailFilter:FALSE];
 	[ContactSelection setNameOrEmailFilter:nil];
 	[PhoneMainView.instance changeCurrentView:ContactsListView.compositeViewDescription];
diff --git a/Classes/ar.lproj/AssistantLinkView.strings b/Classes/ar.lproj/AssistantLinkView.strings
new file mode 100644
index 000000000..747426208
Binary files /dev/null and b/Classes/ar.lproj/AssistantLinkView.strings differ
diff --git a/Classes/ar.lproj/AssistantViewScreens.strings b/Classes/ar.lproj/AssistantViewScreens.strings
index 997c7c022..e002906b9 100644
Binary files a/Classes/ar.lproj/AssistantViewScreens.strings and b/Classes/ar.lproj/AssistantViewScreens.strings differ
diff --git a/Classes/ar.lproj/CountryListView.strings b/Classes/ar.lproj/CountryListView.strings
new file mode 100644
index 000000000..8a2c56702
Binary files /dev/null and b/Classes/ar.lproj/CountryListView.strings differ
diff --git a/Classes/ar.lproj/ShopView.strings b/Classes/ar.lproj/ShopView.strings
new file mode 100644
index 000000000..7fb9e0297
Binary files /dev/null and b/Classes/ar.lproj/ShopView.strings differ
diff --git a/Classes/de.lproj/AssistantLinkView.strings b/Classes/de.lproj/AssistantLinkView.strings
new file mode 100644
index 000000000..bdac0179e
Binary files /dev/null and b/Classes/de.lproj/AssistantLinkView.strings differ
diff --git a/Classes/de.lproj/AssistantViewScreens.strings b/Classes/de.lproj/AssistantViewScreens.strings
index 23a03a1b9..5aa00725c 100644
Binary files a/Classes/de.lproj/AssistantViewScreens.strings and b/Classes/de.lproj/AssistantViewScreens.strings differ
diff --git a/Classes/de.lproj/CallView.strings b/Classes/de.lproj/CallView.strings
index c63cafe09..308243cf7 100644
Binary files a/Classes/de.lproj/CallView.strings and b/Classes/de.lproj/CallView.strings differ
diff --git a/Classes/de.lproj/CallView~ipad.strings b/Classes/de.lproj/CallView~ipad.strings
index c63cafe09..308243cf7 100644
Binary files a/Classes/de.lproj/CallView~ipad.strings and b/Classes/de.lproj/CallView~ipad.strings differ
diff --git a/Classes/de.lproj/CountryListView.strings b/Classes/de.lproj/CountryListView.strings
new file mode 100644
index 000000000..ab0aeaf73
Binary files /dev/null and b/Classes/de.lproj/CountryListView.strings differ
diff --git a/Classes/de.lproj/ShopView.strings b/Classes/de.lproj/ShopView.strings
new file mode 100644
index 000000000..b029ddf57
Binary files /dev/null and b/Classes/de.lproj/ShopView.strings differ
diff --git a/Classes/es.lproj/AssistantLinkView.strings b/Classes/es.lproj/AssistantLinkView.strings
new file mode 100644
index 000000000..1e24bea4a
Binary files /dev/null and b/Classes/es.lproj/AssistantLinkView.strings differ
diff --git a/Classes/es.lproj/ShopView.strings b/Classes/es.lproj/ShopView.strings
new file mode 100644
index 000000000..816d48982
Binary files /dev/null and b/Classes/es.lproj/ShopView.strings differ
diff --git a/Classes/fr.lproj/AssistantLinkView.strings b/Classes/fr.lproj/AssistantLinkView.strings
new file mode 100644
index 000000000..00339167f
Binary files /dev/null and b/Classes/fr.lproj/AssistantLinkView.strings differ
diff --git a/Classes/fr.lproj/AssistantViewScreens.strings b/Classes/fr.lproj/AssistantViewScreens.strings
index f15825a9d..78157e691 100644
Binary files a/Classes/fr.lproj/AssistantViewScreens.strings and b/Classes/fr.lproj/AssistantViewScreens.strings differ
diff --git a/Classes/fr.lproj/CountryListView.strings b/Classes/fr.lproj/CountryListView.strings
new file mode 100644
index 000000000..6c1d863e6
Binary files /dev/null and b/Classes/fr.lproj/CountryListView.strings differ
diff --git a/Classes/fr.lproj/ShopView.strings b/Classes/fr.lproj/ShopView.strings
index e598c42d6..12785ff8a 100644
Binary files a/Classes/fr.lproj/ShopView.strings and b/Classes/fr.lproj/ShopView.strings differ
diff --git a/Classes/ja.lproj/AssistantLinkView.strings b/Classes/ja.lproj/AssistantLinkView.strings
new file mode 100644
index 000000000..bc864f87c
Binary files /dev/null and b/Classes/ja.lproj/AssistantLinkView.strings differ
diff --git a/Classes/ja.lproj/AssistantViewScreens.strings b/Classes/ja.lproj/AssistantViewScreens.strings
index a82f62667..d5ed9ad19 100644
Binary files a/Classes/ja.lproj/AssistantViewScreens.strings and b/Classes/ja.lproj/AssistantViewScreens.strings differ
diff --git a/Classes/ja.lproj/CountryListView.strings b/Classes/ja.lproj/CountryListView.strings
new file mode 100644
index 000000000..cef8abf98
Binary files /dev/null and b/Classes/ja.lproj/CountryListView.strings differ
diff --git a/Classes/ja.lproj/ShopView.strings b/Classes/ja.lproj/ShopView.strings
new file mode 100644
index 000000000..4262031e7
Binary files /dev/null and b/Classes/ja.lproj/ShopView.strings differ
diff --git a/Classes/nl.lproj/AssistantLinkView.strings b/Classes/nl.lproj/AssistantLinkView.strings
new file mode 100644
index 000000000..ec46a8748
Binary files /dev/null and b/Classes/nl.lproj/AssistantLinkView.strings differ
diff --git a/Classes/nl.lproj/AssistantViewScreens.strings b/Classes/nl.lproj/AssistantViewScreens.strings
index 4ece02889..70a447cc1 100644
Binary files a/Classes/nl.lproj/AssistantViewScreens.strings and b/Classes/nl.lproj/AssistantViewScreens.strings differ
diff --git a/Classes/nl.lproj/CountryListView.strings b/Classes/nl.lproj/CountryListView.strings
new file mode 100644
index 000000000..61be60b5f
Binary files /dev/null and b/Classes/nl.lproj/CountryListView.strings differ
diff --git a/Classes/nl.lproj/ShopView.strings b/Classes/nl.lproj/ShopView.strings
new file mode 100644
index 000000000..a06b7ed8b
Binary files /dev/null and b/Classes/nl.lproj/ShopView.strings differ
diff --git a/Classes/pl.lproj/AssistantLinkView.strings b/Classes/pl.lproj/AssistantLinkView.strings
new file mode 100644
index 000000000..8fef95d63
Binary files /dev/null and b/Classes/pl.lproj/AssistantLinkView.strings differ
diff --git a/Classes/pl.lproj/AssistantViewScreens.strings b/Classes/pl.lproj/AssistantViewScreens.strings
index e9dddb005..f38532c40 100644
Binary files a/Classes/pl.lproj/AssistantViewScreens.strings and b/Classes/pl.lproj/AssistantViewScreens.strings differ
diff --git a/Classes/pl.lproj/CountryListView.strings b/Classes/pl.lproj/CountryListView.strings
new file mode 100644
index 000000000..c8d8ef3b5
Binary files /dev/null and b/Classes/pl.lproj/CountryListView.strings differ
diff --git a/Classes/pl.lproj/ShopView.strings b/Classes/pl.lproj/ShopView.strings
new file mode 100644
index 000000000..61f20a681
Binary files /dev/null and b/Classes/pl.lproj/ShopView.strings differ
diff --git a/Classes/ru.lproj/AssistantLinkView.strings b/Classes/ru.lproj/AssistantLinkView.strings
new file mode 100644
index 000000000..7e1726206
Binary files /dev/null and b/Classes/ru.lproj/AssistantLinkView.strings differ
diff --git a/Classes/ru.lproj/AssistantViewScreens.strings b/Classes/ru.lproj/AssistantViewScreens.strings
index eddd07e98..15a4758f1 100644
Binary files a/Classes/ru.lproj/AssistantViewScreens.strings and b/Classes/ru.lproj/AssistantViewScreens.strings differ
diff --git a/Classes/ru.lproj/CountryListView.strings b/Classes/ru.lproj/CountryListView.strings
new file mode 100644
index 000000000..9b7948b77
Binary files /dev/null and b/Classes/ru.lproj/CountryListView.strings differ
diff --git a/Classes/ru.lproj/ShopView.strings b/Classes/ru.lproj/ShopView.strings
new file mode 100644
index 000000000..3dbc99b6b
Binary files /dev/null and b/Classes/ru.lproj/ShopView.strings differ
diff --git a/Classes/sv.lproj/AssistantLinkView.strings b/Classes/sv.lproj/AssistantLinkView.strings
new file mode 100644
index 000000000..9957c6191
Binary files /dev/null and b/Classes/sv.lproj/AssistantLinkView.strings differ
diff --git a/Classes/sv.lproj/AssistantViewScreens.strings b/Classes/sv.lproj/AssistantViewScreens.strings
index d387261a4..08da7d851 100644
Binary files a/Classes/sv.lproj/AssistantViewScreens.strings and b/Classes/sv.lproj/AssistantViewScreens.strings differ
diff --git a/Classes/sv.lproj/CountryListView.strings b/Classes/sv.lproj/CountryListView.strings
new file mode 100644
index 000000000..e526b9d3f
Binary files /dev/null and b/Classes/sv.lproj/CountryListView.strings differ
diff --git a/Classes/sv.lproj/ShopView.strings b/Classes/sv.lproj/ShopView.strings
new file mode 100644
index 000000000..790881116
Binary files /dev/null and b/Classes/sv.lproj/ShopView.strings differ
diff --git a/Classes/tr.lproj/AssistantLinkView.strings b/Classes/tr.lproj/AssistantLinkView.strings
new file mode 100644
index 000000000..a75aee66d
Binary files /dev/null and b/Classes/tr.lproj/AssistantLinkView.strings differ
diff --git a/Classes/tr.lproj/AssistantViewScreens.strings b/Classes/tr.lproj/AssistantViewScreens.strings
index 774313027..af778ead5 100644
Binary files a/Classes/tr.lproj/AssistantViewScreens.strings and b/Classes/tr.lproj/AssistantViewScreens.strings differ
diff --git a/Classes/tr.lproj/CountryListView.strings b/Classes/tr.lproj/CountryListView.strings
new file mode 100644
index 000000000..73a01a4b4
Binary files /dev/null and b/Classes/tr.lproj/CountryListView.strings differ
diff --git a/Classes/tr.lproj/ShopView.strings b/Classes/tr.lproj/ShopView.strings
new file mode 100644
index 000000000..5fa08f7d6
Binary files /dev/null and b/Classes/tr.lproj/ShopView.strings differ
diff --git a/Classes/zh_CN.lproj/AssistantLinkView.strings b/Classes/zh_CN.lproj/AssistantLinkView.strings
new file mode 100644
index 000000000..e4fd284b2
Binary files /dev/null and b/Classes/zh_CN.lproj/AssistantLinkView.strings differ
diff --git a/Classes/zh_CN.lproj/AssistantViewScreens.strings b/Classes/zh_CN.lproj/AssistantViewScreens.strings
index f59646259..6c5720f75 100644
Binary files a/Classes/zh_CN.lproj/AssistantViewScreens.strings and b/Classes/zh_CN.lproj/AssistantViewScreens.strings differ
diff --git a/Classes/zh_CN.lproj/CountryListView.strings b/Classes/zh_CN.lproj/CountryListView.strings
new file mode 100644
index 000000000..1cdc4fb19
Binary files /dev/null and b/Classes/zh_CN.lproj/CountryListView.strings differ
diff --git a/Classes/zh_CN.lproj/ShopView.strings b/Classes/zh_CN.lproj/ShopView.strings
new file mode 100644
index 000000000..9907da645
Binary files /dev/null and b/Classes/zh_CN.lproj/ShopView.strings differ
diff --git a/Classes/zh_TW.lproj/AssistantLinkView.strings b/Classes/zh_TW.lproj/AssistantLinkView.strings
new file mode 100644
index 000000000..36df3b857
Binary files /dev/null and b/Classes/zh_TW.lproj/AssistantLinkView.strings differ
diff --git a/Classes/zh_TW.lproj/AssistantViewScreens.strings b/Classes/zh_TW.lproj/AssistantViewScreens.strings
index 0243b47a5..a0853212e 100644
Binary files a/Classes/zh_TW.lproj/AssistantViewScreens.strings and b/Classes/zh_TW.lproj/AssistantViewScreens.strings differ
diff --git a/Classes/zh_TW.lproj/CountryListView.strings b/Classes/zh_TW.lproj/CountryListView.strings
new file mode 100644
index 000000000..1cdc4fb19
Binary files /dev/null and b/Classes/zh_TW.lproj/CountryListView.strings differ
diff --git a/Classes/zh_TW.lproj/ShopView.strings b/Classes/zh_TW.lproj/ShopView.strings
new file mode 100644
index 000000000..bdcc595ee
Binary files /dev/null and b/Classes/zh_TW.lproj/ShopView.strings differ
diff --git a/Resources/ar.lproj/Localizable.strings b/Resources/ar.lproj/Localizable.strings
index 235371743..439ffaf99 100644
Binary files a/Resources/ar.lproj/Localizable.strings and b/Resources/ar.lproj/Localizable.strings differ
diff --git a/Resources/de.lproj/Localizable.strings b/Resources/de.lproj/Localizable.strings
index 092be5dbc..3a5513764 100644
Binary files a/Resources/de.lproj/Localizable.strings and b/Resources/de.lproj/Localizable.strings differ
diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings
index 6629af758..2cd663c29 100644
Binary files a/Resources/en.lproj/Localizable.strings and b/Resources/en.lproj/Localizable.strings differ
diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings
index a386fe74f..68d655270 100644
Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ
diff --git a/Resources/ja.lproj/Localizable.strings b/Resources/ja.lproj/Localizable.strings
index c5265dbe1..a6b5d51cb 100644
Binary files a/Resources/ja.lproj/Localizable.strings and b/Resources/ja.lproj/Localizable.strings differ
diff --git a/Resources/nl.lproj/Localizable.strings b/Resources/nl.lproj/Localizable.strings
index 4fb9e1ee6..c29f7a577 100644
Binary files a/Resources/nl.lproj/Localizable.strings and b/Resources/nl.lproj/Localizable.strings differ
diff --git a/Resources/pl.lproj/Localizable.strings b/Resources/pl.lproj/Localizable.strings
index df2c5162f..db813b604 100644
Binary files a/Resources/pl.lproj/Localizable.strings and b/Resources/pl.lproj/Localizable.strings differ
diff --git a/Resources/ru.lproj/Localizable.strings b/Resources/ru.lproj/Localizable.strings
index b7ace5426..abf5b4583 100644
Binary files a/Resources/ru.lproj/Localizable.strings and b/Resources/ru.lproj/Localizable.strings differ
diff --git a/Resources/sv.lproj/Localizable.strings b/Resources/sv.lproj/Localizable.strings
index f2689245b..0486bb26c 100644
Binary files a/Resources/sv.lproj/Localizable.strings and b/Resources/sv.lproj/Localizable.strings differ
diff --git a/Resources/tr.lproj/Localizable.strings b/Resources/tr.lproj/Localizable.strings
index a7721b019..40b217dc1 100644
Binary files a/Resources/tr.lproj/Localizable.strings and b/Resources/tr.lproj/Localizable.strings differ
diff --git a/Resources/zh_CN.lproj/Localizable.strings b/Resources/zh_CN.lproj/Localizable.strings
index 7b6267e96..ecfceff6a 100644
Binary files a/Resources/zh_CN.lproj/Localizable.strings and b/Resources/zh_CN.lproj/Localizable.strings differ
diff --git a/Resources/zh_TW.lproj/Localizable.strings b/Resources/zh_TW.lproj/Localizable.strings
index c059f4ee4..3a0ed48fa 100644
Binary files a/Resources/zh_TW.lproj/Localizable.strings and b/Resources/zh_TW.lproj/Localizable.strings differ
diff --git a/Settings/InAppSettings.bundle/ar.lproj/Account.strings b/Settings/InAppSettings.bundle/ar.lproj/Account.strings
index 2ec6cb322..00eaacf91 100644
Binary files a/Settings/InAppSettings.bundle/ar.lproj/Account.strings and b/Settings/InAppSettings.bundle/ar.lproj/Account.strings differ
diff --git a/Settings/InAppSettings.bundle/ar.lproj/Network.strings b/Settings/InAppSettings.bundle/ar.lproj/Network.strings
index 7056060ad..35afe469f 100644
Binary files a/Settings/InAppSettings.bundle/ar.lproj/Network.strings and b/Settings/InAppSettings.bundle/ar.lproj/Network.strings differ
diff --git a/Settings/InAppSettings.bundle/de.lproj/Account.strings b/Settings/InAppSettings.bundle/de.lproj/Account.strings
index 7c58d4cbe..4fa653fa8 100644
Binary files a/Settings/InAppSettings.bundle/de.lproj/Account.strings and b/Settings/InAppSettings.bundle/de.lproj/Account.strings differ
diff --git a/Settings/InAppSettings.bundle/de.lproj/Network.strings b/Settings/InAppSettings.bundle/de.lproj/Network.strings
index e5217b8aa..457369c93 100644
Binary files a/Settings/InAppSettings.bundle/de.lproj/Network.strings and b/Settings/InAppSettings.bundle/de.lproj/Network.strings differ
diff --git a/Settings/InAppSettings.bundle/en.lproj/Network.strings b/Settings/InAppSettings.bundle/en.lproj/Network.strings
index 6b0aa9922..7b2f1efff 100644
--- a/Settings/InAppSettings.bundle/en.lproj/Network.strings
+++ b/Settings/InAppSettings.bundle/en.lproj/Network.strings
@@ -2,6 +2,7 @@
 "Wifi only" = "Wifi only";
 "Stun Server" = "Stun Server";
 "ICE" = "ICE";
+"TURN" = "TURN";
 "Random Port" = "Random Port";
 "Port" = "Port";
 "Audio Port(s)" = "Audio Port(s)";
diff --git a/Settings/InAppSettings.bundle/fr.lproj/Account.strings b/Settings/InAppSettings.bundle/fr.lproj/Account.strings
index 05dccc328..da164aca2 100644
Binary files a/Settings/InAppSettings.bundle/fr.lproj/Account.strings and b/Settings/InAppSettings.bundle/fr.lproj/Account.strings differ
diff --git a/Settings/InAppSettings.bundle/fr.lproj/Network.strings b/Settings/InAppSettings.bundle/fr.lproj/Network.strings
index d9d84059f..20d457949 100644
Binary files a/Settings/InAppSettings.bundle/fr.lproj/Network.strings and b/Settings/InAppSettings.bundle/fr.lproj/Network.strings differ
diff --git a/Settings/InAppSettings.bundle/ja.lproj/Account.strings b/Settings/InAppSettings.bundle/ja.lproj/Account.strings
index 8e59ee170..bff83c099 100644
Binary files a/Settings/InAppSettings.bundle/ja.lproj/Account.strings and b/Settings/InAppSettings.bundle/ja.lproj/Account.strings differ
diff --git a/Settings/InAppSettings.bundle/ja.lproj/Network.strings b/Settings/InAppSettings.bundle/ja.lproj/Network.strings
index 948db6f92..56cd02253 100644
Binary files a/Settings/InAppSettings.bundle/ja.lproj/Network.strings and b/Settings/InAppSettings.bundle/ja.lproj/Network.strings differ
diff --git a/Settings/InAppSettings.bundle/nl.lproj/Account.strings b/Settings/InAppSettings.bundle/nl.lproj/Account.strings
index c1ea67e83..20c899713 100644
Binary files a/Settings/InAppSettings.bundle/nl.lproj/Account.strings and b/Settings/InAppSettings.bundle/nl.lproj/Account.strings differ
diff --git a/Settings/InAppSettings.bundle/nl.lproj/Network.strings b/Settings/InAppSettings.bundle/nl.lproj/Network.strings
index 16f70ae92..841cb3b2a 100644
Binary files a/Settings/InAppSettings.bundle/nl.lproj/Network.strings and b/Settings/InAppSettings.bundle/nl.lproj/Network.strings differ
diff --git a/Settings/InAppSettings.bundle/pl.lproj/Account.strings b/Settings/InAppSettings.bundle/pl.lproj/Account.strings
index 74d610faa..87e4dd7df 100644
Binary files a/Settings/InAppSettings.bundle/pl.lproj/Account.strings and b/Settings/InAppSettings.bundle/pl.lproj/Account.strings differ
diff --git a/Settings/InAppSettings.bundle/pl.lproj/Network.strings b/Settings/InAppSettings.bundle/pl.lproj/Network.strings
index 8c1b94f3a..5aa92e262 100644
Binary files a/Settings/InAppSettings.bundle/pl.lproj/Network.strings and b/Settings/InAppSettings.bundle/pl.lproj/Network.strings differ
diff --git a/Settings/InAppSettings.bundle/ru.lproj/Account.strings b/Settings/InAppSettings.bundle/ru.lproj/Account.strings
index 7cfe769ac..20e5d4346 100644
Binary files a/Settings/InAppSettings.bundle/ru.lproj/Account.strings and b/Settings/InAppSettings.bundle/ru.lproj/Account.strings differ
diff --git a/Settings/InAppSettings.bundle/ru.lproj/Network.strings b/Settings/InAppSettings.bundle/ru.lproj/Network.strings
index 6b63f31dd..9f77ab332 100644
Binary files a/Settings/InAppSettings.bundle/ru.lproj/Network.strings and b/Settings/InAppSettings.bundle/ru.lproj/Network.strings differ
diff --git a/Settings/InAppSettings.bundle/sv.lproj/Account.strings b/Settings/InAppSettings.bundle/sv.lproj/Account.strings
index 935dce1e9..5660abb3f 100644
Binary files a/Settings/InAppSettings.bundle/sv.lproj/Account.strings and b/Settings/InAppSettings.bundle/sv.lproj/Account.strings differ
diff --git a/Settings/InAppSettings.bundle/sv.lproj/Network.strings b/Settings/InAppSettings.bundle/sv.lproj/Network.strings
index 148739c7d..5134eb870 100644
Binary files a/Settings/InAppSettings.bundle/sv.lproj/Network.strings and b/Settings/InAppSettings.bundle/sv.lproj/Network.strings differ
diff --git a/Settings/InAppSettings.bundle/tr.lproj/Account.strings b/Settings/InAppSettings.bundle/tr.lproj/Account.strings
index 93cf2a1e9..61ee80da8 100644
Binary files a/Settings/InAppSettings.bundle/tr.lproj/Account.strings and b/Settings/InAppSettings.bundle/tr.lproj/Account.strings differ
diff --git a/Settings/InAppSettings.bundle/tr.lproj/Network.strings b/Settings/InAppSettings.bundle/tr.lproj/Network.strings
index 523cafcfa..782b0e7d7 100644
Binary files a/Settings/InAppSettings.bundle/tr.lproj/Network.strings and b/Settings/InAppSettings.bundle/tr.lproj/Network.strings differ
diff --git a/Settings/InAppSettings.bundle/zh_CN.lproj/Account.strings b/Settings/InAppSettings.bundle/zh_CN.lproj/Account.strings
index 830a313a8..4ff6dab56 100644
Binary files a/Settings/InAppSettings.bundle/zh_CN.lproj/Account.strings and b/Settings/InAppSettings.bundle/zh_CN.lproj/Account.strings differ
diff --git a/Settings/InAppSettings.bundle/zh_CN.lproj/Network.strings b/Settings/InAppSettings.bundle/zh_CN.lproj/Network.strings
index e61ec10ef..a900e1af4 100644
Binary files a/Settings/InAppSettings.bundle/zh_CN.lproj/Network.strings and b/Settings/InAppSettings.bundle/zh_CN.lproj/Network.strings differ
diff --git a/Settings/InAppSettings.bundle/zh_TW.lproj/Account.strings b/Settings/InAppSettings.bundle/zh_TW.lproj/Account.strings
index 143f8ce8b..6b9a6ef7f 100644
Binary files a/Settings/InAppSettings.bundle/zh_TW.lproj/Account.strings and b/Settings/InAppSettings.bundle/zh_TW.lproj/Account.strings differ
diff --git a/Settings/InAppSettings.bundle/zh_TW.lproj/Network.strings b/Settings/InAppSettings.bundle/zh_TW.lproj/Network.strings
index 94fa85bab..b098baf21 100644
Binary files a/Settings/InAppSettings.bundle/zh_TW.lproj/Network.strings and b/Settings/InAppSettings.bundle/zh_TW.lproj/Network.strings differ