From 6df31a7b36a9d0a88e61bc1372222176df309fae Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 4 Aug 2015 10:22:45 +0200
Subject: [PATCH] outgoing/incoming

---
 .../Base.lproj/IncomingCallViewController.xib | 139 +++---
 .../Base.lproj/OutgoingCallViewController.xib | 143 +++---
 Classes/Base.lproj/SettingsViewController.xib |   1 +
 Classes/Base.lproj/WizardViews.xib            |  21 +-
 Classes/ChatRoomViewController.m              |   2 +-
 Classes/ChatViewController.m                  |   2 +-
 Classes/ContactDetailsLabelViewController.m   |   2 +-
 Classes/ContactDetailsViewController.m        |   2 +-
 Classes/ContactsViewController.m              |   2 +-
 Classes/FirstLoginViewController.m            |   2 +-
 Classes/HistoryDetailsViewController.m        |   2 +-
 Classes/HistoryViewController.m               |   2 +-
 Classes/ImagePickerViewController.m           |   2 +-
 Classes/ImageViewController.m                 |   2 +-
 Classes/IncomingCallViewController.h          |   2 +-
 Classes/IncomingCallViewController.m          |   7 +-
 Classes/LinphoneUI/Base.lproj/UICallBar.xib   | 446 +-----------------
 Classes/LinphoneUI/Base.lproj/UIStateBar.xib  |   8 +-
 Classes/LinphoneUI/UIHistoryCell.m            |   2 +-
 Classes/LinphoneUI/UIStateBar.m               |   6 +-
 Classes/OutgoingCallViewController.h          |   6 +
 Classes/OutgoingCallViewController.m          |  29 +-
 Classes/SideMenuViewController.h              |   1 +
 Classes/SideMenuViewController.m              |   5 +
 Classes/SideMenuViewController.xib            |  15 +-
 Classes/Utils/FastAddressBook.m               |   6 +-
 linphone.xcodeproj/project.pbxproj            |   6 +-
 27 files changed, 246 insertions(+), 617 deletions(-)

diff --git a/Classes/Base.lproj/IncomingCallViewController.xib b/Classes/Base.lproj/IncomingCallViewController.xib
index 99eb0b566..994422954 100644
--- a/Classes/Base.lproj/IncomingCallViewController.xib
+++ b/Classes/Base.lproj/IncomingCallViewController.xib
@@ -7,8 +7,9 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="IncomingCallViewController">
             <connections>
-                <outlet property="addressLabel" destination="9" id="14"/>
+                <outlet property="addressLabel" destination="78f-eb-xdx" id="Qjw-7G-oqG"/>
                 <outlet property="avatarImage" destination="19" id="20"/>
+                <outlet property="nameLabel" destination="hjQ-4P-bKP" id="Elh-o8-zM9"/>
                 <outlet property="portraitView" destination="25" id="32"/>
                 <outlet property="view" destination="25" id="26"/>
             </connections>
@@ -19,110 +20,90 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" id="25">
-                    <rect key="frame" x="0.0" y="42" width="375" height="559"/>
+                    <rect key="frame" x="0.0" y="42" width="375" height="625"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
-                        <view tag="1" contentMode="scaleToFill" id="8">
-                            <rect key="frame" x="0.0" y="0.0" width="375" height="480"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                            <subviews>
-                                <imageView userInteractionEnabled="NO" tag="2" contentMode="scaleToFill" image="cell_call_first.png" id="21" userLabel="addressBackgroundImage">
-                                    <rect key="frame" x="0.0" y="49" width="375" height="63"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                </imageView>
-                                <imageView userInteractionEnabled="NO" tag="3" contentMode="scaleToFill" image="header_incoming.png" id="12" userLabel="headerBackground">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="68"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="">
-                                        <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
-                                    </accessibility>
-                                </imageView>
-                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="4" contentMode="left" text="Incoming call" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="31" userLabel="headerLabel">
-                                    <rect key="frame" x="20" y="0.0" width="335" height="50"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Incoming call"/>
-                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="27"/>
-                                    <color key="textColor" red="0.7254902124" green="0.76862746479999999" blue="0.79607844350000001" alpha="1" colorSpace="deviceRGB"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                                <label autoresizesSubviews="NO" opaque="NO" userInteractionEnabled="NO" tag="5" contentMode="left" text="0102030405" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="9" userLabel="addressLabel">
-                                    <rect key="frame" x="10" y="53" width="355" height="51"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Contact name"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="30"/>
-                                    <color key="textColor" red="0.43529411764705883" green="0.44313725490196076" blue="0.47450980392156861" alpha="1" colorSpace="calibratedRGB"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                                <imageView userInteractionEnabled="NO" tag="6" contentMode="scaleToFill" image="avatar_shadow.png" id="18" userLabel="avatarShadowImage">
-                                    <rect key="frame" x="28" y="96" width="320" height="262"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                </imageView>
-                                <imageView userInteractionEnabled="NO" tag="7" contentMode="scaleToFill" image="avatar_unknown.png" id="19" userLabel="avatarImage">
-                                    <rect key="frame" x="108" y="113" width="160" height="170"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Contact avatar">
-                                        <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
-                                        <bool key="isElement" value="YES"/>
-                                    </accessibility>
-                                </imageView>
-                            </subviews>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                        </view>
+                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="4" contentMode="left" text="INCOMING CALL" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="31" userLabel="headerLabel">
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                            <color key="backgroundColor" red="0.88235294119999996" green="0.88235294119999996" blue="0.88235294119999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <accessibility key="accessibilityConfiguration" label="Incoming call"/>
+                            <fontDescription key="fontDescription" type="boldSystem" pointSize="27"/>
+                            <color key="textColor" red="1" green="0.36862745099999999" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <imageView userInteractionEnabled="NO" tag="7" contentMode="scaleAspectFit" image="avatar.png" id="19" userLabel="avatarImage" customClass="UIRoundedImageView">
+                            <rect key="frame" x="46" y="58" width="283" height="283"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <accessibility key="accessibilityConfiguration" label="Contact avatar">
+                                <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
+                                <bool key="isElement" value="YES"/>
+                            </accessibility>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="John Doe" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hjQ-4P-bKP" userLabel="nameLabel">
+                            <rect key="frame" x="46" y="359" width="283" height="32"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="37"/>
+                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
                         <view tag="10" contentMode="scaleToFill" id="4" userLabel="tabBar">
-                            <rect key="frame" x="0.0" y="482" width="375" height="77"/>
+                            <rect key="frame" x="0.0" y="562" width="375" height="63"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                             <subviews>
-                                <view hidden="YES" userInteractionEnabled="NO" tag="-1" contentMode="scaleToFill" id="5" userLabel="mask">
-                                    <rect key="frame" x="0.0" y="10" width="375" height="67"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                                </view>
-                                <button opaque="NO" tag="11" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="7" userLabel="acceptButton">
-                                    <rect key="frame" x="0.0" y="0.0" width="188" height="77"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Accept"/>
-                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                                    <state key="normal" backgroundImage="accept_default.png">
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                    </state>
-                                    <state key="highlighted" backgroundImage="accept_over.png"/>
-                                    <connections>
-                                        <action selector="onAcceptClick:" destination="-1" eventType="touchUpInside" id="15"/>
-                                    </connections>
-                                </button>
                                 <button opaque="NO" tag="12" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="6" userLabel="declineButton">
-                                    <rect key="frame" x="188" y="0.0" width="187" height="77"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="188" height="63"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Decline"/>
                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                                    <state key="normal" backgroundImage="decline_default.png">
+                                    <state key="normal" image="call_hangup.png" backgroundImage="color_D.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
-                                    <state key="highlighted" backgroundImage="decline_over.png"/>
+                                    <state key="highlighted" backgroundImage="color_I.png"/>
                                     <connections>
                                         <action selector="onDeclineClick:" destination="-1" eventType="touchUpInside" id="16"/>
                                     </connections>
                                 </button>
+                                <button opaque="NO" tag="11" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="7" userLabel="acceptButton">
+                                    <rect key="frame" x="187" y="0.0" width="188" height="63"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
+                                    <accessibility key="accessibilityConfiguration" label="Accept"/>
+                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                    <state key="normal" image="call_audio_start.png" backgroundImage="color_A.png">
+                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    </state>
+                                    <state key="highlighted" backgroundImage="color_L.png"/>
+                                    <connections>
+                                        <action selector="onAcceptClick:" destination="-1" eventType="touchUpInside" id="15"/>
+                                    </connections>
+                                </button>
                             </subviews>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         </view>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="john.doe@sip.linphone.org" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="8" id="78f-eb-xdx" userLabel="addressLabel">
+                            <rect key="frame" x="90" y="399" width="194" height="22"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" red="1" green="0.36862745099999999" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
                     </subviews>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                 </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="-8.5" y="271.5"/>
         </view>
     </objects>
     <resources>
-        <image name="accept_default.png" width="320" height="154"/>
-        <image name="accept_over.png" width="320" height="154"/>
-        <image name="avatar_shadow.png" width="640" height="523"/>
-        <image name="avatar_unknown.png" width="320" height="339"/>
-        <image name="cell_call_first.png" width="640" height="125"/>
-        <image name="decline_default.png" width="320" height="154"/>
-        <image name="decline_over.png" width="320" height="154"/>
-        <image name="header_incoming.png" width="640" height="135"/>
+        <image name="avatar.png" width="261" height="261"/>
+        <image name="call_audio_start.png" width="37" height="37"/>
+        <image name="call_hangup.png" width="42" height="37"/>
+        <image name="color_A.png" width="1" height="1"/>
+        <image name="color_D.png" width="1" height="1"/>
+        <image name="color_I.png" width="1" height="1"/>
+        <image name="color_L.png" width="1" height="1"/>
     </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
diff --git a/Classes/Base.lproj/OutgoingCallViewController.xib b/Classes/Base.lproj/OutgoingCallViewController.xib
index 16d701ac1..df3cf32f1 100644
--- a/Classes/Base.lproj/OutgoingCallViewController.xib
+++ b/Classes/Base.lproj/OutgoingCallViewController.xib
@@ -7,8 +7,9 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="OutgoingCallViewController">
             <connections>
-                <outlet property="addressLabel" destination="9" id="14"/>
-                <outlet property="avatarImage" destination="19" id="20"/>
+                <outlet property="addressLabel" destination="2fa-Ag-3GW" id="2Oe-UW-rPC"/>
+                <outlet property="avatarImage" destination="bNo-O5-DWh" id="eqo-0s-UoN"/>
+                <outlet property="nameLabel" destination="d5s-yP-8VE" id="0VY-HP-ovD"/>
                 <outlet property="portraitView" destination="25" id="32"/>
                 <outlet property="view" destination="25" id="26"/>
             </connections>
@@ -19,95 +20,82 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" id="25">
-                    <rect key="frame" x="0.0" y="42" width="375" height="559"/>
+                    <rect key="frame" x="0.0" y="42" width="375" height="625"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
-                        <view tag="1" contentMode="scaleToFill" id="8">
-                            <rect key="frame" x="0.0" y="0.0" width="375" height="480"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                            <subviews>
-                                <imageView userInteractionEnabled="NO" tag="2" contentMode="scaleToFill" image="cell_call_first.png" id="21" userLabel="addressBackgroundImage">
-                                    <rect key="frame" x="0.0" y="49" width="375" height="63"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                </imageView>
-                                <imageView userInteractionEnabled="NO" tag="3" contentMode="scaleToFill" image="header_incoming.png" id="12" userLabel="headerBackground">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="68"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="">
-                                        <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
-                                    </accessibility>
-                                </imageView>
-                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="4" contentMode="left" text="Incoming call" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="31" userLabel="headerLabel">
-                                    <rect key="frame" x="20" y="0.0" width="335" height="50"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Incoming call"/>
-                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="27"/>
-                                    <color key="textColor" red="0.7254902124" green="0.76862746479999999" blue="0.79607844350000001" alpha="1" colorSpace="deviceRGB"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                                <label autoresizesSubviews="NO" opaque="NO" userInteractionEnabled="NO" tag="5" contentMode="left" text="0102030405" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="9" userLabel="addressLabel">
-                                    <rect key="frame" x="10" y="53" width="355" height="51"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Contact name"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="30"/>
-                                    <color key="textColor" red="0.43529411764705883" green="0.44313725490196076" blue="0.47450980392156861" alpha="1" colorSpace="calibratedRGB"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                                <imageView userInteractionEnabled="NO" tag="6" contentMode="scaleToFill" image="avatar_shadow.png" id="18" userLabel="avatarShadowImage">
-                                    <rect key="frame" x="28" y="96" width="320" height="262"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                </imageView>
-                                <imageView userInteractionEnabled="NO" tag="7" contentMode="scaleToFill" image="avatar_unknown.png" id="19" userLabel="avatarImage">
-                                    <rect key="frame" x="108" y="113" width="160" height="170"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Contact avatar">
-                                        <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
-                                        <bool key="isElement" value="YES"/>
-                                    </accessibility>
-                                </imageView>
-                            </subviews>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                        </view>
-                        <view tag="10" contentMode="scaleToFill" id="4" userLabel="tabBar">
-                            <rect key="frame" x="0.0" y="482" width="375" height="77"/>
+                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="4" contentMode="left" text="OUTGOING CALL" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Blx-QR-J2o" userLabel="headerLabel">
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                            <color key="backgroundColor" red="0.88235294119999996" green="0.88235294119999996" blue="0.88235294119999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <accessibility key="accessibilityConfiguration" label="Incoming call"/>
+                            <fontDescription key="fontDescription" type="boldSystem" pointSize="27"/>
+                            <color key="textColor" red="1" green="0.36862745099999999" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <imageView userInteractionEnabled="NO" tag="7" contentMode="scaleAspectFit" image="avatar.png" id="bNo-O5-DWh" userLabel="avatarImage" customClass="UIRoundedImageView">
+                            <rect key="frame" x="46" y="58" width="283" height="283"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <accessibility key="accessibilityConfiguration" label="Contact avatar">
+                                <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
+                                <bool key="isElement" value="YES"/>
+                            </accessibility>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="John Doe" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="d5s-yP-8VE" userLabel="nameLabel">
+                            <rect key="frame" x="46" y="359" width="283" height="32"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="37"/>
+                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="john.doe@sip.linphone.org" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="8" id="2fa-Ag-3GW" userLabel="addressLabel">
+                            <rect key="frame" x="90" y="399" width="194" height="22"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <color key="textColor" red="1" green="0.36862745099999999" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view tag="10" contentMode="scaleToFill" id="8Qi-Cq-3XH" userLabel="tabBar">
+                            <rect key="frame" x="0.0" y="562" width="375" height="63"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                             <subviews>
-                                <view hidden="YES" userInteractionEnabled="NO" tag="-1" contentMode="scaleToFill" id="5" userLabel="mask">
-                                    <rect key="frame" x="0.0" y="10" width="375" height="67"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                                </view>
-                                <button opaque="NO" tag="11" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="7" userLabel="acceptButton">
-                                    <rect key="frame" x="0.0" y="0.0" width="188" height="77"/>
+                                <button opaque="NO" tag="11" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="26e-Pj-2Oh" userLabel="microButton" customClass="UIMicroButton">
+                                    <rect key="frame" x="0.0" y="0.0" width="94" height="63"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Accept"/>
                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                                    <state key="normal" backgroundImage="accept_default.png">
+                                    <state key="normal" image="micro_default.png" backgroundImage="color_F.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
-                                    <state key="highlighted" backgroundImage="accept_over.png"/>
-                                    <connections>
-                                        <action selector="onAcceptClick:" destination="-1" eventType="touchUpInside" id="15"/>
-                                    </connections>
+                                    <state key="selected" image="micro_selected.png"/>
                                 </button>
-                                <button opaque="NO" tag="12" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="6" userLabel="declineButton">
-                                    <rect key="frame" x="188" y="0.0" width="187" height="77"/>
+                                <button opaque="NO" tag="11" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="G7m-Av-QlR" userLabel="speakerButton" customClass="UISpeakerButton">
+                                    <rect key="frame" x="94" y="0.0" width="94" height="63"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
+                                    <accessibility key="accessibilityConfiguration" label="Accept"/>
+                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                    <state key="normal" image="speaker_default.png" backgroundImage="color_F.png">
+                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    </state>
+                                    <state key="selected" image="speaker_selected.png"/>
+                                </button>
+                                <button opaque="NO" tag="12" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="AaM-cH-pvW" userLabel="declineButton">
+                                    <rect key="frame" x="187" y="0.0" width="188" height="63"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Decline"/>
                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                                    <state key="normal" backgroundImage="decline_default.png">
+                                    <state key="normal" image="call_hangup.png" backgroundImage="color_D.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
-                                    <state key="highlighted" backgroundImage="decline_over.png"/>
+                                    <state key="highlighted" backgroundImage="color_I.png"/>
                                     <connections>
-                                        <action selector="onDeclineClick:" destination="-1" eventType="touchUpInside" id="16"/>
+                                        <action selector="onDeclineClick:" destination="-1" eventType="touchUpInside" id="Ebl-hM-8F9"/>
                                     </connections>
                                 </button>
                             </subviews>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         </view>
                     </subviews>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                 </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -116,14 +104,15 @@
         </view>
     </objects>
     <resources>
-        <image name="accept_default.png" width="320" height="154"/>
-        <image name="accept_over.png" width="320" height="154"/>
-        <image name="avatar_shadow.png" width="640" height="523"/>
-        <image name="avatar_unknown.png" width="320" height="339"/>
-        <image name="cell_call_first.png" width="640" height="125"/>
-        <image name="decline_default.png" width="320" height="154"/>
-        <image name="decline_over.png" width="320" height="154"/>
-        <image name="header_incoming.png" width="640" height="135"/>
+        <image name="avatar.png" width="261" height="261"/>
+        <image name="call_hangup.png" width="42" height="37"/>
+        <image name="color_D.png" width="1" height="1"/>
+        <image name="color_F.png" width="1" height="1"/>
+        <image name="color_I.png" width="1" height="1"/>
+        <image name="micro_default.png" width="30" height="38"/>
+        <image name="micro_selected.png" width="30" height="38"/>
+        <image name="speaker_default.png" width="28" height="26"/>
+        <image name="speaker_selected.png" width="28" height="26"/>
     </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
diff --git a/Classes/Base.lproj/SettingsViewController.xib b/Classes/Base.lproj/SettingsViewController.xib
index 02bdacbb4..584610896 100644
--- a/Classes/Base.lproj/SettingsViewController.xib
+++ b/Classes/Base.lproj/SettingsViewController.xib
@@ -26,6 +26,7 @@
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
             <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
+            <point key="canvasLocation" x="-42.5" y="261.5"/>
         </view>
         <navigationController definesPresentationContext="YES" id="10" userLabel="navigationController" customClass="UINavigationControllerEx">
             <extendedEdge key="edgesForExtendedLayout"/>
diff --git a/Classes/Base.lproj/WizardViews.xib b/Classes/Base.lproj/WizardViews.xib
index 731eb4004..ec354b32a 100644
--- a/Classes/Base.lproj/WizardViews.xib
+++ b/Classes/Base.lproj/WizardViews.xib
@@ -267,7 +267,7 @@
                     <nil key="highlightedColor"/>
                     <size key="shadowOffset" width="-1" height="-1"/>
                 </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="2/2" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="mao-1f-HLz" userLabel="subtitleLabel">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="2/2" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" minimumFontSize="10" id="mao-1f-HLz" userLabel="subtitleLabel">
                     <rect key="frame" x="36" y="100" width="302" height="29"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <accessibility key="accessibilityConfiguration" label="Account setup assistant"/>
@@ -325,7 +325,7 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="562"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="CREATE YOUR ACCOUNT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="LbS-op-QAh" userLabel="titleLabel">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="LOGIN WITH YOUR LINPHONE ACCOUNT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="LbS-op-QAh" userLabel="titleLabel">
                     <rect key="frame" x="36" y="34" width="302" height="59"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <accessibility key="accessibilityConfiguration" label="Account setup assistant"/>
@@ -334,7 +334,7 @@
                     <nil key="highlightedColor"/>
                     <size key="shadowOffset" width="-1" height="-1"/>
                 </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="1/2" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="4n3-ZD-KVi" userLabel="subtitleLabel">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please enter your credentials below" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" minimumFontSize="10" id="4n3-ZD-KVi" userLabel="subtitleLabel">
                     <rect key="frame" x="36" y="100" width="302" height="29"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <accessibility key="accessibilityConfiguration" label="Account setup assistant"/>
@@ -417,7 +417,7 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="562"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="CREATE YOUR ACCOUNT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="wen-Vj-Wgv" userLabel="titleLabel">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="LOGIN WITH YOUR ACCOUNT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="wen-Vj-Wgv" userLabel="titleLabel">
                     <rect key="frame" x="36" y="34" width="302" height="59"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <accessibility key="accessibilityConfiguration" label="Account setup assistant"/>
@@ -426,7 +426,7 @@
                     <nil key="highlightedColor"/>
                     <size key="shadowOffset" width="-1" height="-1"/>
                 </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="1/2" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="LsE-IY-ocU" userLabel="subtitleLabel">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Please enter your credentials below" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" minimumFontSize="10" id="LsE-IY-ocU" userLabel="subtitleLabel">
                     <rect key="frame" x="36" y="100" width="302" height="29"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <accessibility key="accessibilityConfiguration" label="Account setup assistant"/>
@@ -544,7 +544,7 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="562"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="CREATE YOUR ACCOUNT" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="8ko-YU-KdD" userLabel="titleLabel">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="PROVISIONNED LOGIN" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="8ko-YU-KdD" userLabel="titleLabel">
                     <rect key="frame" x="36" y="34" width="302" height="59"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <accessibility key="accessibilityConfiguration" label="Account setup assistant"/>
@@ -553,7 +553,7 @@
                     <nil key="highlightedColor"/>
                     <size key="shadowOffset" width="-1" height="-1"/>
                 </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="1/2" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="njd-TT-zP8" userLabel="subtitleLabel">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="These parameters were retrieved from a remote provisioning profile." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" minimumFontSize="10" id="njd-TT-zP8" userLabel="subtitleLabel">
                     <rect key="frame" x="36" y="100" width="302" height="29"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <accessibility key="accessibilityConfiguration" label="Account setup assistant"/>
@@ -644,13 +644,6 @@
                         <action selector="onSignInClick:" destination="-1" eventType="touchUpInside" id="vUt-n5-MqK"/>
                     </connections>
                 </button>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="These parameters were retrieved from a remote provisioning profile." textAlignment="center" lineBreakMode="wordWrap" numberOfLines="7" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="RHE-hi-dfB" userLabel="remoteParamsLabel">
-                    <rect key="frame" x="38" y="353.00000395658537" width="299" height="57"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                    <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
-                    <nil key="highlightedColor"/>
-                </label>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             <nil key="simulatedStatusBarMetrics"/>
diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m
index a07528708..90dfa01ec 100644
--- a/Classes/ChatRoomViewController.m
+++ b/Classes/ChatRoomViewController.m
@@ -77,7 +77,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	if (compositeDescription == nil) {
 		compositeDescription = [[UICompositeViewDescription alloc] init:@"ChatRoom"
 																content:@"ChatRoomViewController"
-															   stateBar:nil
+															   stateBar:@"UIStateBar"
 																 tabBar:/*@"UIMainBar"*/ nil
 															 fullscreen:false
 														  landscapeMode:true
diff --git a/Classes/ChatViewController.m b/Classes/ChatViewController.m
index 9ca71bf88..3750c9565 100644
--- a/Classes/ChatViewController.m
+++ b/Classes/ChatViewController.m
@@ -65,7 +65,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	if (compositeDescription == nil) {
 		compositeDescription = [[UICompositeViewDescription alloc] init:@"Chat"
 																content:@"ChatViewController"
-															   stateBar:nil
+															   stateBar:@"UIStateBar"
 																 tabBar:@"UIMainBar"
 															 fullscreen:false
 														  landscapeMode:[LinphoneManager runningOnIpad]
diff --git a/Classes/ContactDetailsLabelViewController.m b/Classes/ContactDetailsLabelViewController.m
index 2a6c9a9c7..30bffd2f3 100644
--- a/Classes/ContactDetailsLabelViewController.m
+++ b/Classes/ContactDetailsLabelViewController.m
@@ -38,7 +38,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	if (compositeDescription == nil) {
 		compositeDescription = [[UICompositeViewDescription alloc] init:@"ContactDetailsLabel"
 																content:@"ContactDetailsLabelViewController"
-															   stateBar:nil
+															   stateBar:@"UIStateBar"
 																 tabBar:@"UIMainBar"
 															 fullscreen:false
 														  landscapeMode:[LinphoneManager runningOnIpad]
diff --git a/Classes/ContactDetailsViewController.m b/Classes/ContactDetailsViewController.m
index 2d85562ba..3f46ef554 100644
--- a/Classes/ContactDetailsViewController.m
+++ b/Classes/ContactDetailsViewController.m
@@ -209,7 +209,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	if (compositeDescription == nil) {
 		compositeDescription = [[UICompositeViewDescription alloc] init:@"ContactDetails"
 																content:@"ContactDetailsViewController"
-															   stateBar:nil
+															   stateBar:@"UIStateBar"
 																 tabBar:@"UIMainBar"
 															 fullscreen:false
 														  landscapeMode:[LinphoneManager runningOnIpad]
diff --git a/Classes/ContactsViewController.m b/Classes/ContactsViewController.m
index ba7132535..e72bdffa8 100644
--- a/Classes/ContactsViewController.m
+++ b/Classes/ContactsViewController.m
@@ -107,7 +107,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	if (compositeDescription == nil) {
 		compositeDescription = [[UICompositeViewDescription alloc] init:@"Contacts"
 																content:@"ContactsViewController"
-															   stateBar:nil
+															   stateBar:@"UIStateBar"
 																 tabBar:@"UIMainBar"
 															 fullscreen:false
 														  landscapeMode:[LinphoneManager runningOnIpad]
diff --git a/Classes/FirstLoginViewController.m b/Classes/FirstLoginViewController.m
index c473ddb92..ab4d97759 100644
--- a/Classes/FirstLoginViewController.m
+++ b/Classes/FirstLoginViewController.m
@@ -50,7 +50,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	if (compositeDescription == nil) {
 		compositeDescription = [[UICompositeViewDescription alloc] init:@"FirstLogin"
 																content:@"FirstLoginViewController"
-															   stateBar:nil
+															   stateBar:@"UIStateBar"
 																 tabBar:nil
 															 fullscreen:false
 														  landscapeMode:false
diff --git a/Classes/HistoryDetailsViewController.m b/Classes/HistoryDetailsViewController.m
index 6a1f227b2..65ce3dad3 100644
--- a/Classes/HistoryDetailsViewController.m
+++ b/Classes/HistoryDetailsViewController.m
@@ -51,7 +51,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	if (compositeDescription == nil) {
 		compositeDescription = [[UICompositeViewDescription alloc] init:@"HistoryDetails"
 																content:@"HistoryDetailsViewController"
-															   stateBar:nil
+															   stateBar:@"UIStateBar"
 																 tabBar:@"UIMainBar"
 															 fullscreen:false
 														  landscapeMode:[LinphoneManager runningOnIpad]
diff --git a/Classes/HistoryViewController.m b/Classes/HistoryViewController.m
index c9f77611b..a48c90a7b 100644
--- a/Classes/HistoryViewController.m
+++ b/Classes/HistoryViewController.m
@@ -45,7 +45,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	if (compositeDescription == nil) {
 		compositeDescription = [[UICompositeViewDescription alloc] init:@"History"
 																content:@"HistoryViewController"
-															   stateBar:nil
+															   stateBar:@"UIStateBar"
 																 tabBar:@"UIMainBar"
 															 fullscreen:false
 														  landscapeMode:[LinphoneManager runningOnIpad]
diff --git a/Classes/ImagePickerViewController.m b/Classes/ImagePickerViewController.m
index 3d6b8ef6c..4bf2b64ae 100644
--- a/Classes/ImagePickerViewController.m
+++ b/Classes/ImagePickerViewController.m
@@ -50,7 +50,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	if (compositeDescription == nil) {
 		compositeDescription = [[UICompositeViewDescription alloc] init:@"ImagePicker"
 																content:@"ImagePickerViewController"
-															   stateBar:nil
+															   stateBar:@"UIStateBar"
 																 tabBar:nil
 															 fullscreen:false
 														  landscapeMode:[LinphoneManager runningOnIpad]
diff --git a/Classes/ImageViewController.m b/Classes/ImageViewController.m
index 3f44a223c..930b3ab70 100644
--- a/Classes/ImageViewController.m
+++ b/Classes/ImageViewController.m
@@ -126,7 +126,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	if (compositeDescription == nil) {
 		compositeDescription = [[UICompositeViewDescription alloc] init:@"ImageView"
 																content:@"ImageViewController"
-															   stateBar:nil
+															   stateBar:@"UIStateBar"
 																 tabBar:nil
 															 fullscreen:false
 														  landscapeMode:[LinphoneManager runningOnIpad]
diff --git a/Classes/IncomingCallViewController.h b/Classes/IncomingCallViewController.h
index 0eadd3734..34142cd19 100644
--- a/Classes/IncomingCallViewController.h
+++ b/Classes/IncomingCallViewController.h
@@ -33,7 +33,7 @@
 
 @interface IncomingCallViewController : TPMultiLayoutViewController <UICompositeViewDelegate> {
 }
-
+@property(weak, nonatomic) IBOutlet UILabel *nameLabel;
 @property (nonatomic, strong) IBOutlet UILabel* addressLabel;
 @property (nonatomic, strong) IBOutlet UIImageView* avatarImage;
 @property (nonatomic, assign) LinphoneCall* call;
diff --git a/Classes/IncomingCallViewController.m b/Classes/IncomingCallViewController.m
index 3e534540f..bd09e3631 100644
--- a/Classes/IncomingCallViewController.m
+++ b/Classes/IncomingCallViewController.m
@@ -65,7 +65,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	if (compositeDescription == nil) {
 		compositeDescription = [[UICompositeViewDescription alloc] init:@"IncomingCall"
 																content:@"IncomingCallViewController"
-															   stateBar:nil
+															   stateBar:@"UIStateBar"
 																 tabBar:nil
 															 fullscreen:false
 														  landscapeMode:[LinphoneManager runningOnIpad]
@@ -102,7 +102,10 @@ static UICompositeViewDescription *compositeDescription = nil;
 	[self view]; // Force view load
 
 	const LinphoneAddress *addr = linphone_call_get_remote_address(call);
-	[FastAddressBook setDisplayNameLabel:addressLabel forAddress:addr];
+	[FastAddressBook setDisplayNameLabel:_nameLabel forAddress:addr];
+	char *uri = linphone_address_as_string_uri_only(addr);
+	addressLabel.text = [NSString stringWithUTF8String:uri];
+	ms_free(uri);
 	avatarImage.image =
 		[FastAddressBook getContactImage:[FastAddressBook getContactWithLinphoneAddress:addr] thumbnail:NO];
 }
diff --git a/Classes/LinphoneUI/Base.lproj/UICallBar.xib b/Classes/LinphoneUI/Base.lproj/UICallBar.xib
index 54710c95f..3a77686e8 100644
--- a/Classes/LinphoneUI/Base.lproj/UICallBar.xib
+++ b/Classes/LinphoneUI/Base.lproj/UICallBar.xib
@@ -10,7 +10,6 @@
                 <outlet property="conferenceButton" destination="21" id="27"/>
                 <outlet property="dialerButton" destination="6" id="140"/>
                 <outlet property="hangupButton" destination="7" id="29"/>
-                <outlet property="landscapeView" destination="100" id="137"/>
                 <outlet property="microButton" destination="11" id="14"/>
                 <outlet property="optionsAddButton" destination="88" id="96"/>
                 <outlet property="optionsButton" destination="10" id="19"/>
@@ -30,24 +29,15 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="4" userLabel="Portrait View" customClass="UITransparentView">
-            <rect key="frame" x="0.0" y="0.0" width="360" height="537"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="537"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
             <subviews>
-                <button opaque="NO" tag="24" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="8" userLabel="pauseButton" customClass="UIPauseButton">
-                    <rect key="frame" x="0.0" y="0.0" width="90" height="63"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                    <accessibility key="accessibilityConfiguration" label="Pause"/>
-                    <state key="normal" backgroundImage="color_A.png">
-                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                    </state>
-                    <state key="highlighted" backgroundImage="color_L.png"/>
-                </button>
                 <view contentMode="scaleToFill" id="Z0i-Wa-v3W" userLabel="pad">
-                    <rect key="frame" x="-8" y="55" width="375" height="428"/>
+                    <rect key="frame" x="-8" y="55" width="390" height="428"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <subviews>
                         <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Vif-go-yYD" userLabel="1" customClass="UIDigitButton">
-                            <rect key="frame" x="0.0" y="0.0" width="120" height="102"/>
+                            <rect key="frame" x="0.0" y="0.0" width="125" height="102"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <color key="backgroundColor" red="0.40000001000000002" green="1" blue="1" alpha="0.0" colorSpace="calibratedRGB"/>
                             <accessibility key="accessibilityConfiguration" label="1"/>
@@ -57,7 +47,7 @@
                             </state>
                         </button>
                         <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="aSN-dE-nox" userLabel="2" customClass="UIDigitButton">
-                            <rect key="frame" x="128" y="0.0" width="120" height="102"/>
+                            <rect key="frame" x="133" y="0.0" width="125" height="102"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="2"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -66,7 +56,7 @@
                             </state>
                         </button>
                         <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="vMR-tZ-YJg" userLabel="3" customClass="UIDigitButton">
-                            <rect key="frame" x="255" y="0.0" width="120" height="102"/>
+                            <rect key="frame" x="265" y="0.0" width="125" height="102"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="3"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -75,7 +65,7 @@
                             </state>
                         </button>
                         <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="9IY-Jl-Oro" userLabel="4" customClass="UIDigitButton">
-                            <rect key="frame" x="0.0" y="108" width="120" height="102"/>
+                            <rect key="frame" x="0.0" y="108" width="125" height="102"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="4"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -84,7 +74,7 @@
                             </state>
                         </button>
                         <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="AFs-pU-gjq" userLabel="5" customClass="UIDigitButton">
-                            <rect key="frame" x="128" y="108" width="120" height="102"/>
+                            <rect key="frame" x="133" y="108" width="125" height="102"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="5"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -93,7 +83,7 @@
                             </state>
                         </button>
                         <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="eB4-Pv-HYn" userLabel="6" customClass="UIDigitButton">
-                            <rect key="frame" x="255" y="108" width="120" height="102"/>
+                            <rect key="frame" x="265" y="108" width="125" height="102"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="6"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -102,7 +92,7 @@
                             </state>
                         </button>
                         <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="VYE-Vx-g6z" userLabel="7" customClass="UIDigitButton">
-                            <rect key="frame" x="0.0" y="215" width="120" height="102"/>
+                            <rect key="frame" x="0.0" y="215" width="125" height="102"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="7"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -111,7 +101,7 @@
                             </state>
                         </button>
                         <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="v0T-VQ-YTz" userLabel="8" customClass="UIDigitButton">
-                            <rect key="frame" x="128" y="215" width="120" height="102"/>
+                            <rect key="frame" x="133" y="215" width="125" height="102"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="8"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -120,7 +110,7 @@
                             </state>
                         </button>
                         <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="tPu-j0-VEy" userLabel="9" customClass="UIDigitButton">
-                            <rect key="frame" x="255" y="215" width="120" height="102"/>
+                            <rect key="frame" x="265" y="215" width="125" height="102"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="9"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -129,7 +119,7 @@
                             </state>
                         </button>
                         <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="G8s-QA-eFM" userLabel="*" customClass="UIDigitButton">
-                            <rect key="frame" x="0.0" y="323" width="120" height="102"/>
+                            <rect key="frame" x="0.0" y="323" width="125" height="102"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="Star"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -138,7 +128,7 @@
                             </state>
                         </button>
                         <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="N5S-my-Ylk" userLabel="0" customClass="UIDigitButton">
-                            <rect key="frame" x="128" y="323" width="120" height="102"/>
+                            <rect key="frame" x="133" y="323" width="125" height="102"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="0"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -147,7 +137,7 @@
                             </state>
                         </button>
                         <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="lub-fq-8yY" userLabel="#" customClass="UIDigitButton">
-                            <rect key="frame" x="255" y="323" width="120" height="102"/>
+                            <rect key="frame" x="265" y="323" width="125" height="102"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="Sharp"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -158,8 +148,17 @@
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </view>
+                <button opaque="NO" tag="24" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="8" userLabel="pauseButton" customClass="UIPauseButton">
+                    <rect key="frame" x="142" y="237" width="90" height="63"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
+                    <accessibility key="accessibilityConfiguration" label="Pause"/>
+                    <state key="normal" backgroundImage="color_A.png">
+                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                    </state>
+                    <state key="highlighted" backgroundImage="color_L.png"/>
+                </button>
                 <view tag="33" contentMode="scaleToFill" id="167" userLabel="routesView">
-                    <rect key="frame" x="187" y="156" width="80" height="185"/>
+                    <rect key="frame" x="197" y="156" width="80" height="185"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
                         <button opaque="NO" tag="30" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="174" userLabel="routesBluetoothButton">
@@ -229,7 +228,7 @@
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </view>
                 <view tag="15" contentMode="scaleToFill" id="87" userLabel="optionsView">
-                    <rect key="frame" x="280" y="208" width="80" height="126"/>
+                    <rect key="frame" x="295" y="208" width="80" height="126"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
                         <button opaque="NO" tag="16" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="90" userLabel="optionsTansferButton">
@@ -278,7 +277,7 @@
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </view>
                 <view tag="18" contentMode="scaleToFill" id="30" userLabel="buttons">
-                    <rect key="frame" x="0.0" y="411" width="360" height="126"/>
+                    <rect key="frame" x="8" y="411" width="360" height="126"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
                         <button opaque="NO" tag="19" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="12" userLabel="videoButton" customClass="UIVideoButton">
@@ -395,361 +394,10 @@
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <point key="canvasLocation" x="170" y="-104.5"/>
         </view>
-        <view contentMode="scaleToFill" id="100" userLabel="Landscape View" customClass="UITransparentView">
-            <rect key="frame" x="0.0" y="0.0" width="537" height="360"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-            <subviews>
-                <view tag="1" contentMode="scaleToFill" id="102" userLabel="padView">
-                    <rect key="frame" x="117" y="0.0" width="281" height="260"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <subviews>
-                        <imageView userInteractionEnabled="NO" tag="2" contentMode="scaleToFill" image="dialer_alt_background.png" id="114" userLabel="background">
-                            <rect key="frame" x="0.0" y="0.0" width="281" height="260"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        </imageView>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="115" userLabel="1" customClass="UIDigitButton">
-                            <rect key="frame" x="-20" y="10" width="107" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <color key="backgroundColor" red="0.40000001000000002" green="1" blue="1" alpha="0.0" colorSpace="calibratedRGB"/>
-                            <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
-                            <state key="normal" image="numpad_one_default.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" image="numpad_one_over.png"/>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="116" userLabel="2" customClass="UIDigitButton">
-                            <rect key="frame" x="87" y="10" width="106" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
-                            <state key="normal" image="numpad_two_default.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" image="numpad_two_over.png"/>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" tag="5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="117" userLabel="3" customClass="UIDigitButton">
-                            <rect key="frame" x="193" y="10" width="107" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
-                            <state key="normal" image="numpad_three_default.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" image="numpad_three_over.png"/>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" tag="6" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="118" userLabel="4" customClass="UIDigitButton">
-                            <rect key="frame" x="-20" y="72" width="107" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
-                            <state key="normal" image="numpad_four_default.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" image="numpad_four_over.png"/>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" tag="7" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="119" userLabel="5" customClass="UIDigitButton">
-                            <rect key="frame" x="87" y="72" width="106" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
-                            <state key="normal" image="numpad_five_default.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" image="numpad_five_over.png"/>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" tag="8" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="120" userLabel="6" customClass="UIDigitButton">
-                            <rect key="frame" x="193" y="72" width="107" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
-                            <state key="normal" image="numpad_six_default.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" image="numpad_six_over.png"/>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" tag="9" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="121" userLabel="7" customClass="UIDigitButton">
-                            <rect key="frame" x="-20" y="134" width="107" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
-                            <state key="normal" image="numpad_seven_default.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" image="numpad_seven_over.png"/>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" tag="10" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="122" userLabel="8" customClass="UIDigitButton">
-                            <rect key="frame" x="87" y="134" width="106" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
-                            <state key="normal" image="numpad_eight_default.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" image="numpad_eight_over.png"/>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" tag="11" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="123" userLabel="9" customClass="UIDigitButton">
-                            <rect key="frame" x="193" y="134" width="107" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
-                            <state key="normal" image="numpad_nine_default.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" image="numpad_nine_over.png"/>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" tag="12" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="124" userLabel="*" customClass="UIDigitButton">
-                            <rect key="frame" x="-20" y="196" width="107" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
-                            <state key="normal" image="numpad_star_default.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" image="numpad_star_over.png"/>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" tag="13" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="125" userLabel="0" customClass="UIDigitButtonLongPlus">
-                            <rect key="frame" x="87" y="196" width="106" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
-                            <state key="normal" image="numpad_zero_default.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" image="numpad_zero_over.png"/>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" tag="14" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="126" userLabel="#" customClass="UIDigitButton">
-                            <rect key="frame" x="193" y="196" width="107" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
-                            <state key="normal" image="numpad_sharp_default.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" image="numpad_sharp_over.png"/>
-                        </button>
-                    </subviews>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                </view>
-                <view tag="33" contentMode="scaleToFill" id="186" userLabel="routesView">
-                    <rect key="frame" x="324" y="85" width="65" height="170"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <subviews>
-                        <button opaque="NO" tag="30" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="193" userLabel="routesBluetoothButton">
-                            <rect key="frame" x="0.0" y="0.0" width="65" height="57"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label=""/>
-                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                            <inset key="titleEdgeInsets" minX="0.0" minY="28" maxX="0.0" maxY="0.0"/>
-                            <state key="normal" title="Bluetooth" backgroundImage="route_bluetooth_off_default_landscape.png">
-                                <color key="titleColor" red="0.25490196079999999" green="0.28235294119999998" blue="0.30980392159999998" alpha="1" colorSpace="deviceRGB"/>
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="disabled" backgroundImage="route_bluetooth_off_disabled_landscape.png">
-                                <color key="titleColor" red="0.65098039220000004" green="0.70196078429999997" blue="0.74901960779999999" alpha="1" colorSpace="deviceRGB"/>
-                            </state>
-                            <state key="selected" backgroundImage="route_bluetooth_on_default_landscape.png"/>
-                            <state key="highlighted" backgroundImage="route_bluetooth_off_over_landscape.png">
-                                <color key="titleColor" red="0.81176470590000005" green="0.29803921570000003" blue="0.16078431369999999" alpha="1" colorSpace="deviceRGB"/>
-                            </state>
-                        </button>
-                        <button opaque="NO" tag="31" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="188" userLabel="routesReceiverButton">
-                            <rect key="frame" x="0.0" y="55" width="65" height="57"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label=""/>
-                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                            <inset key="titleEdgeInsets" minX="0.0" minY="28" maxX="0.0" maxY="0.0"/>
-                            <state key="normal" title="Receiver" backgroundImage="route_phone_off_default_landscape.png">
-                                <color key="titleColor" red="0.25490196079999999" green="0.28235294119999998" blue="0.30980392159999998" alpha="1" colorSpace="deviceRGB"/>
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="disabled" backgroundImage="route_phone_off_disabled_landscape.png">
-                                <color key="titleColor" red="0.65098039220000004" green="0.70196078429999997" blue="0.74901960779999999" alpha="1" colorSpace="deviceRGB"/>
-                            </state>
-                            <state key="selected" backgroundImage="route_phone_on_default_landscape.png"/>
-                            <state key="highlighted" backgroundImage="route_phone_off_over_landscape.png">
-                                <color key="titleColor" red="0.81176470590000005" green="0.29803921570000003" blue="0.16078431369999999" alpha="1" colorSpace="deviceRGB"/>
-                            </state>
-                        </button>
-                        <button opaque="NO" tag="32" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="187" userLabel="routesSpeakerButton">
-                            <rect key="frame" x="0.0" y="108" width="65" height="57"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label=""/>
-                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                            <inset key="titleEdgeInsets" minX="0.0" minY="28" maxX="0.0" maxY="0.0"/>
-                            <state key="normal" title="Speaker" backgroundImage="route_speaker_off_default_landscape.png">
-                                <color key="titleColor" red="0.25490196079999999" green="0.28235294119999998" blue="0.30980392159999998" alpha="1" colorSpace="deviceRGB"/>
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="disabled" backgroundImage="route_speaker_off_disabled_landscape.png">
-                                <color key="titleColor" red="0.65098039220000004" green="0.70196078429999997" blue="0.74901960779999999" alpha="1" colorSpace="deviceRGB"/>
-                            </state>
-                            <state key="selected" backgroundImage="route_speaker_on_default_landscape.png"/>
-                            <state key="highlighted" backgroundImage="route_speaker_off_over_landscape.png">
-                                <color key="titleColor" red="0.81176470590000005" green="0.29803921570000003" blue="0.16078431369999999" alpha="1" colorSpace="deviceRGB"/>
-                            </state>
-                        </button>
-                    </subviews>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                </view>
-                <view tag="15" contentMode="scaleToFill" id="101" userLabel="optionsView">
-                    <rect key="frame" x="472" y="140" width="65" height="105"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <subviews>
-                        <button opaque="NO" tag="16" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="128" userLabel="optionsTansferButton">
-                            <rect key="frame" x="0.0" y="0.0" width="65" height="55"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label=""/>
-                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                            <inset key="titleEdgeInsets" minX="0.0" minY="28" maxX="0.0" maxY="0.0"/>
-                            <state key="normal" title="Transfer" backgroundImage="options_transfer_default_landscape.png">
-                                <color key="titleColor" red="0.25490196079999999" green="0.28235294119999998" blue="0.30980392159999998" alpha="1" colorSpace="deviceRGB"/>
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="disabled" backgroundImage="options_transfer_disabled_landscape.png">
-                                <color key="titleColor" red="0.65098039220000004" green="0.70196078429999997" blue="0.74901960779999999" alpha="1" colorSpace="deviceRGB"/>
-                            </state>
-                            <state key="highlighted" backgroundImage="options_transfer_over_landscape.png">
-                                <color key="titleColor" red="0.81176470590000005" green="0.29803921570000003" blue="0.16078431369999999" alpha="1" colorSpace="deviceRGB"/>
-                            </state>
-                            <connections>
-                                <action selector="onOptionsClick:" destination="-1" eventType="touchUpInside" id="131"/>
-                                <action selector="onOptionsTransferClick:" destination="-1" eventType="touchUpInside" id="133"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" tag="17" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="127" userLabel="optionsAddButton">
-                            <rect key="frame" x="0.0" y="51" width="65" height="55"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label=""/>
-                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                            <inset key="titleEdgeInsets" minX="0.0" minY="28" maxX="0.0" maxY="0.0"/>
-                            <state key="normal" title="Add call" backgroundImage="options_add_default_landscape.png">
-                                <color key="titleColor" red="0.25490196079999999" green="0.28235294119999998" blue="0.30980392159999998" alpha="1" colorSpace="deviceRGB"/>
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="disabled" backgroundImage="options_add_disabled_landscape.png">
-                                <color key="titleColor" red="0.65098039220000004" green="0.70196078429999997" blue="0.74901960779999999" alpha="1" colorSpace="deviceRGB"/>
-                            </state>
-                            <state key="highlighted" backgroundImage="options_add_over_landscape.png">
-                                <color key="titleColor" red="0.81176470590000005" green="0.29803921570000003" blue="0.16078431369999999" alpha="1" colorSpace="deviceRGB"/>
-                            </state>
-                            <connections>
-                                <action selector="onOptionsAddClick:" destination="-1" eventType="touchUpInside" id="130"/>
-                                <action selector="onOptionsClick:" destination="-1" eventType="touchUpInside" id="136"/>
-                            </connections>
-                        </button>
-                    </subviews>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                </view>
-                <view tag="18" contentMode="scaleToFill" id="103" userLabel="buttons">
-                    <rect key="frame" x="29" y="238" width="480" height="82"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <subviews>
-                        <button opaque="NO" tag="19" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="113" userLabel="videoButton" customClass="UIVideoButton">
-                            <rect key="frame" x="65" y="0.0" width="65" height="82"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label=""/>
-                            <inset key="titleEdgeInsets" minX="0.0" minY="24" maxX="0.0" maxY="0.0"/>
-                            <state key="normal" backgroundImage="color_A.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" backgroundImage="color_L.png"/>
-                            <connections>
-                                <outlet property="waitView" destination="105" id="129"/>
-                            </connections>
-                        </button>
-                        <activityIndicatorView hidden="YES" opaque="NO" tag="20" contentMode="scaleToFill" hidesWhenStopped="YES" style="whiteLarge" id="105" userLabel="videoWaitView">
-                            <rect key="frame" x="79" y="20" width="37" height="37"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        </activityIndicatorView>
-                        <button opaque="NO" tag="21" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="112" userLabel="microButton" customClass="UIMicroButton">
-                            <rect key="frame" x="130" y="0.0" width="65" height="82"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label=""/>
-                            <inset key="titleEdgeInsets" minX="0.0" minY="24" maxX="0.0" maxY="0.0"/>
-                            <state key="normal" backgroundImage="color_A.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" backgroundImage="color_L.png"/>
-                        </button>
-                        <button opaque="NO" tag="22" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="111" userLabel="speakerButton" customClass="UISpeakerButton">
-                            <rect key="frame" x="285" y="0.0" width="65" height="82"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label=""/>
-                            <inset key="titleEdgeInsets" minX="0.0" minY="24" maxX="0.0" maxY="0.0"/>
-                            <state key="normal" backgroundImage="color_A.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" backgroundImage="color_L.png"/>
-                        </button>
-                        <button opaque="NO" tag="29" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="183" userLabel="routesButton" customClass="UIToggleButton">
-                            <rect key="frame" x="285" y="0.0" width="65" height="82"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label=""/>
-                            <inset key="titleEdgeInsets" minX="0.0" minY="24" maxX="0.0" maxY="0.0"/>
-                            <state key="normal" backgroundImage="color_A.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" backgroundImage="color_L.png"/>
-                        </button>
-                        <button opaque="NO" tag="23" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="110" userLabel="optionsButton" customClass="UIToggleButton">
-                            <rect key="frame" x="350" y="0.0" width="65" height="82"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label=""/>
-                            <inset key="titleEdgeInsets" minX="0.0" minY="24" maxX="0.0" maxY="0.0"/>
-                            <state key="normal" backgroundImage="color_A.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" backgroundImage="color_L.png"/>
-                            <connections>
-                                <action selector="onOptionsClick:" destination="-1" eventType="touchUpInside" id="134"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" tag="24" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="109" userLabel="pauseButton" customClass="UIPauseButton">
-                            <rect key="frame" x="0.0" y="0.0" width="65" height="82"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label=""/>
-                            <state key="normal" backgroundImage="color_A.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" backgroundImage="color_L.png"/>
-                        </button>
-                        <button hidden="YES" opaque="NO" tag="25" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="108" userLabel="conferenceButton" customClass="UIIconButton">
-                            <rect key="frame" x="0.0" y="0.0" width="65" height="82"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label=""/>
-                            <state key="normal" backgroundImage="color_A.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" backgroundImage="color_L.png"/>
-                            <connections>
-                                <action selector="onConferenceClick:" destination="-1" eventType="touchUpInside" id="135"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" tag="26" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="107" userLabel="hangupButton" customClass="UIHangUpButton">
-                            <rect key="frame" x="195" y="0.0" width="90" height="82"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label=""/>
-                            <state key="normal" backgroundImage="color_A.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" backgroundImage="color_L.png"/>
-                        </button>
-                        <button opaque="NO" tag="27" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="106" userLabel="dialerButton" customClass="UIToggleButton">
-                            <rect key="frame" x="415" y="0.0" width="65" height="82"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label=""/>
-                            <state key="normal" backgroundImage="color_A.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" backgroundImage="color_L.png"/>
-                            <connections>
-                                <action selector="onPadClick:" destination="-1" eventType="touchUpInside" id="132"/>
-                            </connections>
-                        </button>
-                    </subviews>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                </view>
-            </subviews>
-            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-            <nil key="simulatedStatusBarMetrics"/>
-            <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="660.5" y="-175"/>
-        </view>
     </objects>
     <resources>
         <image name="color_A.png" width="1" height="1"/>
         <image name="color_L.png" width="1" height="1"/>
-        <image name="dialer_alt_background.png" width="530" height="526"/>
         <image name="numpad_0.png" width="53" height="50"/>
         <image name="numpad_1.png" width="53" height="49"/>
         <image name="numpad_2.png" width="53" height="50"/>
@@ -760,68 +408,26 @@
         <image name="numpad_7.png" width="53" height="49"/>
         <image name="numpad_8.png" width="53" height="50"/>
         <image name="numpad_9.png" width="53" height="50"/>
-        <image name="numpad_eight_default.png" width="220" height="113"/>
-        <image name="numpad_eight_over.png" width="220" height="113"/>
-        <image name="numpad_five_default.png" width="220" height="113"/>
-        <image name="numpad_five_over.png" width="220" height="113"/>
-        <image name="numpad_four_default.png" width="210" height="113"/>
-        <image name="numpad_four_over.png" width="210" height="113"/>
-        <image name="numpad_nine_default.png" width="210" height="113"/>
-        <image name="numpad_nine_over.png" width="210" height="113"/>
-        <image name="numpad_one_default.png" width="210" height="113"/>
-        <image name="numpad_one_over.png" width="210" height="113"/>
-        <image name="numpad_seven_default.png" width="210" height="113"/>
-        <image name="numpad_seven_over.png" width="210" height="113"/>
         <image name="numpad_sharp.png" width="53" height="50"/>
-        <image name="numpad_sharp_default.png" width="210" height="113"/>
-        <image name="numpad_sharp_over.png" width="210" height="113"/>
-        <image name="numpad_six_default.png" width="210" height="113"/>
-        <image name="numpad_six_over.png" width="210" height="113"/>
         <image name="numpad_star.png" width="53" height="52"/>
-        <image name="numpad_star_default.png" width="210" height="113"/>
-        <image name="numpad_star_over.png" width="210" height="113"/>
-        <image name="numpad_three_default.png" width="210" height="113"/>
-        <image name="numpad_three_over.png" width="210" height="113"/>
-        <image name="numpad_two_default.png" width="220" height="113"/>
-        <image name="numpad_two_over.png" width="220" height="113"/>
-        <image name="numpad_zero_default.png" width="220" height="113"/>
-        <image name="numpad_zero_over.png" width="220" height="113"/>
         <image name="options_add_default.png" width="155" height="137"/>
-        <image name="options_add_default_landscape.png" width="129" height="109"/>
         <image name="options_add_disabled.png" width="155" height="137"/>
-        <image name="options_add_disabled_landscape.png" width="129" height="109"/>
         <image name="options_add_over.png" width="155" height="137"/>
-        <image name="options_add_over_landscape.png" width="129" height="109"/>
         <image name="options_transfer_default.png" width="155" height="137"/>
-        <image name="options_transfer_default_landscape.png" width="129" height="109"/>
         <image name="options_transfer_disabled.png" width="155" height="137"/>
-        <image name="options_transfer_disabled_landscape.png" width="129" height="109"/>
         <image name="options_transfer_over.png" width="155" height="137"/>
-        <image name="options_transfer_over_landscape.png" width="129" height="109"/>
         <image name="route_bluetooth_off_default.png" width="160" height="127"/>
-        <image name="route_bluetooth_off_default_landscape.png" width="130" height="114"/>
         <image name="route_bluetooth_off_disabled.png" width="160" height="127"/>
-        <image name="route_bluetooth_off_disabled_landscape.png" width="130" height="114"/>
         <image name="route_bluetooth_off_over.png" width="160" height="127"/>
-        <image name="route_bluetooth_off_over_landscape.png" width="130" height="114"/>
         <image name="route_bluetooth_on_default.png" width="160" height="127"/>
-        <image name="route_bluetooth_on_default_landscape.png" width="130" height="114"/>
         <image name="route_phone_off_default.png" width="160" height="127"/>
-        <image name="route_phone_off_default_landscape.png" width="130" height="114"/>
         <image name="route_phone_off_disabled.png" width="160" height="127"/>
-        <image name="route_phone_off_disabled_landscape.png" width="130" height="114"/>
         <image name="route_phone_off_over.png" width="160" height="127"/>
-        <image name="route_phone_off_over_landscape.png" width="130" height="114"/>
         <image name="route_phone_on_default.png" width="160" height="127"/>
-        <image name="route_phone_on_default_landscape.png" width="130" height="114"/>
         <image name="route_speaker_off_default.png" width="160" height="127"/>
-        <image name="route_speaker_off_default_landscape.png" width="130" height="114"/>
         <image name="route_speaker_off_disabled.png" width="160" height="127"/>
-        <image name="route_speaker_off_disabled_landscape.png" width="130" height="114"/>
         <image name="route_speaker_off_over.png" width="160" height="127"/>
-        <image name="route_speaker_off_over_landscape.png" width="130" height="114"/>
         <image name="route_speaker_on_default.png" width="160" height="127"/>
-        <image name="route_speaker_on_default_landscape.png" width="130" height="114"/>
     </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
diff --git a/Classes/LinphoneUI/Base.lproj/UIStateBar.xib b/Classes/LinphoneUI/Base.lproj/UIStateBar.xib
index be7e16b40..3173c92ea 100644
--- a/Classes/LinphoneUI/Base.lproj/UIStateBar.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIStateBar.xib
@@ -26,9 +26,9 @@
                     <rect key="frame" x="0.0" y="0.0" width="360" height="42"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
-                        <imageView userInteractionEnabled="NO" tag="4" contentMode="scaleToFill" image="call_quality_indicator_2.png" id="13" userLabel="callQualityImage">
-                            <rect key="frame" x="300" y="0.0" width="27" height="40"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                        <imageView userInteractionEnabled="NO" tag="4" contentMode="center" image="call_quality_indicator_4.png" id="13" userLabel="callQualityImage">
+                            <rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="Call quality"/>
                         </imageView>
                         <button opaque="NO" tag="6" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="27" userLabel="callSecurityButton">
@@ -92,7 +92,7 @@
         </view>
     </objects>
     <resources>
-        <image name="call_quality_indicator_2.png" width="19" height="20"/>
+        <image name="call_quality_indicator_4.png" width="20" height="20"/>
         <image name="led_disconnected.png" width="12" height="12"/>
         <image name="menu.png" width="19" height="19"/>
         <image name="security_ok.png" width="13" height="17"/>
diff --git a/Classes/LinphoneUI/UIHistoryCell.m b/Classes/LinphoneUI/UIHistoryCell.m
index d877e17c5..e7a273b71 100644
--- a/Classes/LinphoneUI/UIHistoryCell.m
+++ b/Classes/LinphoneUI/UIHistoryCell.m
@@ -117,8 +117,8 @@
 	}
 	_stateImage.image = image;
 
+	[FastAddressBook setDisplayNameLabel:displayNameLabel forAddress:addr];
 	ABRecordRef contact = [FastAddressBook getContactWithLinphoneAddress:addr];
-	[FastAddressBook setDisplayNameLabel:displayNameLabel forContact:contact];
 	_avatarImage.image = [FastAddressBook getContactImage:contact thumbnail:TRUE];
 }
 
diff --git a/Classes/LinphoneUI/UIStateBar.m b/Classes/LinphoneUI/UIStateBar.m
index 8bd8d0abb..d60aef69a 100644
--- a/Classes/LinphoneUI/UIStateBar.m
+++ b/Classes/LinphoneUI/UIStateBar.m
@@ -262,14 +262,18 @@
 		[self updateUI:YES];
 		// FIXME double check call state before computing, may cause core dump
 		float quality = linphone_call_get_average_quality(call);
+		callQualityImage.hidden = (quality == -1.f);
+
 		if (quality < 1) {
 			image = [UIImage imageNamed:@"call_quality_indicator_0.png"];
 		} else if (quality < 2) {
 			image = [UIImage imageNamed:@"call_quality_indicator_1.png"];
 		} else if (quality < 3) {
 			image = [UIImage imageNamed:@"call_quality_indicator_2.png"];
-		} else {
+		} else if (quality < 4) {
 			image = [UIImage imageNamed:@"call_quality_indicator_3.png"];
+		} else {
+			image = [UIImage imageNamed:@"call_quality_indicator_4.png"];
 		}
 		[callQualityImage setImage:image];
 	}
diff --git a/Classes/OutgoingCallViewController.h b/Classes/OutgoingCallViewController.h
index 877600f06..41196e98c 100644
--- a/Classes/OutgoingCallViewController.h
+++ b/Classes/OutgoingCallViewController.h
@@ -22,8 +22,14 @@
 #import "UICompositeViewController.h"
 #import "TPMultiLayoutViewController.h"
 #include "linphone/linphonecore.h"
+#import "UIRoundedImageView.h"
 
 @interface OutgoingCallViewController : TPMultiLayoutViewController <UICompositeViewDelegate> {
 }
+@property(weak, nonatomic) IBOutlet UIRoundedImageView *avatarImage;
+@property(weak, nonatomic) IBOutlet UILabel *nameLabel;
+@property(weak, nonatomic) IBOutlet UILabel *addressLabel;
+
+- (IBAction)onDeclineClick:(id)sender;
 
 @end
diff --git a/Classes/OutgoingCallViewController.m b/Classes/OutgoingCallViewController.m
index 1f5be1662..8b2ec5fdb 100644
--- a/Classes/OutgoingCallViewController.m
+++ b/Classes/OutgoingCallViewController.m
@@ -18,6 +18,7 @@
  */
 
 #import "OutgoingCallViewController.h"
+#import "PhoneMainView.h"
 
 @implementation OutgoingCallViewController
 
@@ -29,8 +30,8 @@ static UICompositeViewDescription *compositeDescription = nil;
 	if (compositeDescription == nil) {
 		compositeDescription = [[UICompositeViewDescription alloc] init:@"OutgoingCall"
 																content:@"OutgoingCallViewController"
-															   stateBar:nil
-																 tabBar:@"UICallBar"
+															   stateBar:@"UIStateBar"
+																 tabBar:nil
 															 fullscreen:false
 														  landscapeMode:[LinphoneManager runningOnIpad]
 														   portraitMode:true];
@@ -39,4 +40,28 @@ static UICompositeViewDescription *compositeDescription = nil;
 	return compositeDescription;
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+	[super viewWillAppear:animated];
+
+	LinphoneCall *call = linphone_core_get_current_call([LinphoneManager getLc]);
+	if (!call) {
+		[[PhoneMainView instance] popCurrentView];
+	} else {
+		const LinphoneAddress *addr = linphone_call_get_remote_address(call);
+		[FastAddressBook setDisplayNameLabel:_nameLabel forAddress:addr];
+		char *uri = linphone_address_as_string_uri_only(addr);
+		_addressLabel.text = [NSString stringWithUTF8String:uri];
+		ms_free(uri);
+		_avatarImage.image =
+			[FastAddressBook getContactImage:[FastAddressBook getContactWithLinphoneAddress:addr] thumbnail:NO];
+	}
+}
+
+- (IBAction)onDeclineClick:(id)sender {
+	LinphoneCall *call = linphone_core_get_current_call([LinphoneManager getLc]);
+	if (call) {
+		linphone_core_terminate_call([LinphoneManager getLc], call);
+	}
+	[[PhoneMainView instance] popCurrentView];
+}
 @end
diff --git a/Classes/SideMenuViewController.h b/Classes/SideMenuViewController.h
index 1f6f263db..8816e5f39 100644
--- a/Classes/SideMenuViewController.h
+++ b/Classes/SideMenuViewController.h
@@ -16,5 +16,6 @@
 @property(weak, nonatomic) IBOutlet UILabel *addressLabel;
 @property(strong, nonatomic) IBOutlet SideMenuTableViewController *sideMenuTableViewController;
 - (IBAction)onLateralSwipe:(id)sender;
+- (IBAction)onHeaderClick:(id)sender;
 
 @end
diff --git a/Classes/SideMenuViewController.m b/Classes/SideMenuViewController.m
index 7390242ca..b22ab4bdd 100644
--- a/Classes/SideMenuViewController.m
+++ b/Classes/SideMenuViewController.m
@@ -37,4 +37,9 @@
 - (IBAction)onLateralSwipe:(id)sender {
 	[[PhoneMainView instance].mainViewController hideSideMenu:YES];
 }
+
+- (IBAction)onHeaderClick:(id)sender {
+	[PhoneMainView.instance changeCurrentView:SettingsViewController.compositeViewDescription];
+	[PhoneMainView.instance.mainViewController hideSideMenu:YES];
+}
 @end
diff --git a/Classes/SideMenuViewController.xib b/Classes/SideMenuViewController.xib
index c0b075ee5..3e557ac1d 100644
--- a/Classes/SideMenuViewController.xib
+++ b/Classes/SideMenuViewController.xib
@@ -37,10 +37,10 @@
                                     <rect key="frame" x="0.0" y="15" width="90" height="61"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 </imageView>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="John Doe" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="XbU-2B-u1b" userLabel="nameLabel">
-                                    <rect key="frame" x="98" y="15" width="194" height="32"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Joghn Doe" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="19" id="XbU-2B-u1b" userLabel="nameLabel">
+                                    <rect key="frame" x="98" y="15" width="194" height="31"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="37"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
@@ -53,6 +53,10 @@
                                 </label>
                             </subviews>
                             <color key="backgroundColor" red="0.88235294119999996" green="0.88235294119999996" blue="0.88235294119999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <gestureRecognizers/>
+                            <connections>
+                                <outletCollection property="gestureRecognizers" destination="1kD-az-BAx" appends="YES" id="GzA-ju-Hpx"/>
+                            </connections>
                         </view>
                         <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Ttt-1k-jAm">
                             <rect key="frame" x="0.0" y="100" width="300" height="532"/>
@@ -82,6 +86,11 @@
             </connections>
             <point key="canvasLocation" x="815" y="194"/>
         </tableViewController>
+        <tapGestureRecognizer id="1kD-az-BAx">
+            <connections>
+                <action selector="onHeaderClick:" destination="-1" id="yqn-58-lbb"/>
+            </connections>
+        </tapGestureRecognizer>
     </objects>
     <resources>
         <image name="avatar.png" width="261" height="261"/>
diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m
index 31a74aa5f..423457e9b 100644
--- a/Classes/Utils/FastAddressBook.m
+++ b/Classes/Utils/FastAddressBook.m
@@ -331,11 +331,13 @@ void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info, void
 	label.text = [FastAddressBook displayNameForContact:contact];
 	NSString *lLastName = CFBridgingRelease(ABRecordCopyValue(contact, kABPersonLastNameProperty));
 	NSString *lLocalizedLastName = [FastAddressBook localizedLabel:lLastName];
-	[label boldSubstring:lLocalizedLastName];
+	if (lLocalizedLastName) {
+		[label boldSubstring:lLocalizedLastName];
+	}
 }
 
 + (NSString *)displayNameForContact:(ABRecordRef)contact {
-	NSString *ret = nil;
+	NSString *ret = NSLocalizedString(@"Unknown", nil);
 	if (contact != nil) {
 		NSString *lFirstName = CFBridgingRelease(ABRecordCopyValue(contact, kABPersonFirstNameProperty));
 		NSString *lLocalizedFirstName = [FastAddressBook localizedLabel:lFirstName];
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 0b2c89388..eec0e8a2c 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -105,6 +105,7 @@
 		63058AE31B4E93B300EFAE36 /* tester_hosts in Resources */ = {isa = PBXBuildFile; fileRef = 63058AE11B4E93A100EFAE36 /* tester_hosts */; };
 		630CF5571AF7CE1500539F7A /* UITextField+DoneButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 630CF5561AF7CE1500539F7A /* UITextField+DoneButton.m */; };
 		631348301B6F7B6600C6BDCB /* UIRoundBorderedButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 6313482F1B6F7B6600C6BDCB /* UIRoundBorderedButton.m */; };
+		631348321B6FA53300C6BDCB /* rootca.pem in Resources */ = {isa = PBXBuildFile; fileRef = 631348311B6FA53300C6BDCB /* rootca.pem */; };
 		631560341B69175F0047F4D3 /* color_A.png in Resources */ = {isa = PBXBuildFile; fileRef = 631560281B69175F0047F4D3 /* color_A.png */; };
 		631560351B69175F0047F4D3 /* color_B.png in Resources */ = {isa = PBXBuildFile; fileRef = 631560291B69175F0047F4D3 /* color_B.png */; };
 		631560361B69175F0047F4D3 /* color_C.png in Resources */ = {isa = PBXBuildFile; fileRef = 6315602A1B69175F0047F4D3 /* color_C.png */; };
@@ -695,6 +696,7 @@
 		630CF5561AF7CE1500539F7A /* UITextField+DoneButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UITextField+DoneButton.m"; sourceTree = "<group>"; };
 		6313482E1B6F7B6600C6BDCB /* UIRoundBorderedButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIRoundBorderedButton.h; sourceTree = "<group>"; };
 		6313482F1B6F7B6600C6BDCB /* UIRoundBorderedButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIRoundBorderedButton.m; sourceTree = "<group>"; };
+		631348311B6FA53300C6BDCB /* rootca.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = rootca.pem; path = "liblinphone-sdk/apple-darwin/share/linphone/rootca.pem"; sourceTree = SOURCE_ROOT; };
 		631560281B69175F0047F4D3 /* color_A.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = color_A.png; sourceTree = "<group>"; };
 		631560291B69175F0047F4D3 /* color_B.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = color_B.png; sourceTree = "<group>"; };
 		6315602A1B69175F0047F4D3 /* color_C.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = color_C.png; sourceTree = "<group>"; };
@@ -1857,7 +1859,6 @@
 		63AADBC31B6A0FF200AA16FD /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				63AADBC41B6A0FF200AA16FD /* Localizable.strings */,
 				63AADBC91B6A0FF200AA16FD /* hold.wav */,
 				63AADBCA1B6A0FF200AA16FD /* Images.xcassets */,
 				63AADBCC1B6A0FF200AA16FD /* launchscreen */,
@@ -1866,11 +1867,13 @@
 				63AADBD81B6A0FF200AA16FD /* linphonerc-factory */,
 				63AADBD91B6A0FF200AA16FD /* linphonerc-factory~ipad */,
 				63AADBDA1B6A0FF200AA16FD /* linphonerc~ipad */,
+				63AADBC41B6A0FF200AA16FD /* Localizable.strings */,
 				63AADBDB1B6A0FF200AA16FD /* msg.caf */,
 				63AADBDC1B6A0FF200AA16FD /* msg.wav */,
 				63AADBDE1B6A0FF200AA16FD /* ring.caf */,
 				63AADBDF1B6A0FF200AA16FD /* ring.wav */,
 				63AADBE01B6A0FF200AA16FD /* ringback.wav */,
+				631348311B6FA53300C6BDCB /* rootca.pem */,
 				63AADBE21B6A0FF200AA16FD /* shortring.caf */,
 				63AADBE31B6A0FF200AA16FD /* wizard_external_sip.rc */,
 				63AADBE41B6A0FF200AA16FD /* wizard_linphone_create.rc */,
@@ -2470,6 +2473,7 @@
 				63AADBE81B6A0FF200AA16FD /* Localizable.strings in Resources */,
 				D381881115FE3F0B00C3EDCA /* UICallCell.xib in Resources */,
 				634CEDCA1B6630DB00D7A921 /* deselect_all.png in Resources */,
+				631348321B6FA53300C6BDCB /* rootca.pem in Resources */,
 				634CEDC51B6630DB00D7A921 /* contacts_sip_default.png in Resources */,
 				D381881915FE3FCA00C3EDCA /* InCallViewController.xib in Resources */,
 				634CEDFA1B6630DB00D7A921 /* pause_small_over_selected.png in Resources */,