From 4d329dd0439dff2955552df47515624eaca63bea Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 8 Sep 2015 12:07:35 +0200
Subject: [PATCH] never use color directly, use images instead

---
 Classes/Base.lproj/ChatRoomViewController.xib |  11 +-
 Classes/Base.lproj/ChatViewController.xib     |  26 +-
 .../ContactDetailsLabelViewController.xib     |  36 +-
 .../ContactDetailsViewController.xib          |   6 +-
 Classes/Base.lproj/ContactsViewController.xib |  17 +-
 Classes/Base.lproj/DialerViewController.xib   |   5 +-
 .../Base.lproj/DialerViewController~ipad.xib  | 412 ------------------
 .../Base.lproj/FirstLoginViewController.xib   | 107 -----
 .../HistoryDetailsViewController.xib          |   8 +-
 Classes/Base.lproj/HistoryViewController.xib  |  14 +-
 Classes/Base.lproj/ImageViewController.xib    |  34 +-
 Classes/Base.lproj/InCallViewController.xib   | 203 +++++----
 .../Base.lproj/IncomingCallViewController.xib |  13 +-
 .../IncomingCallViewController~ipad.xib       | 223 ----------
 .../Base.lproj/OutgoingCallViewController.xib |  20 +-
 Classes/Base.lproj/PhoneMainView.xib          |   9 +-
 Classes/Base.lproj/WizardViewController.xib   |   9 +-
 .../Base.lproj/WizardViewController~ipad.xib  | 211 ---------
 Classes/FirstLoginViewController.h            |  36 --
 Classes/FirstLoginViewController.m            | 192 --------
 Classes/LaunchScreen.xib                      |   2 +-
 Classes/LinphoneUI/Base.lproj/UIMainBar.xib   |   9 +-
 Classes/LinphoneUI/Base.lproj/UIStateBar.xib  |   6 +-
 Classes/MainStoryboard.storyboard             |  15 +-
 Classes/PhoneMainView.h                       |   2 -
 Classes/PhoneMainView.m                       |   3 +-
 Classes/SideMenuViewController.xib            |   6 +-
 .../DialerViewController~ipad.strings         | Bin 4658 -> 0 bytes
 .../ar.lproj/FirstLoginViewController.strings | Bin 1306 -> 0 bytes
 .../IncomingCallViewController~ipad.strings   | Bin 3150 -> 0 bytes
 .../WizardViewController~ipad.strings         | Bin 2482 -> 0 bytes
 .../DialerViewController~ipad.strings         | Bin 4762 -> 0 bytes
 .../fr.lproj/FirstLoginViewController.strings | Bin 1366 -> 0 bytes
 .../IncomingCallViewController~ipad.strings   | Bin 3158 -> 0 bytes
 .../WizardViewController~ipad.strings         | Bin 2522 -> 0 bytes
 .../DialerViewController~ipad.strings         | Bin 4728 -> 0 bytes
 .../ru.lproj/FirstLoginViewController.strings | Bin 1306 -> 0 bytes
 .../IncomingCallViewController~ipad.strings   | Bin 3166 -> 0 bytes
 .../WizardViewController~ipad.strings         | Bin 2506 -> 0 bytes
 linphone.xcodeproj/project.pbxproj            |  88 +---
 40 files changed, 248 insertions(+), 1475 deletions(-)
 delete mode 100644 Classes/Base.lproj/DialerViewController~ipad.xib
 delete mode 100644 Classes/Base.lproj/FirstLoginViewController.xib
 delete mode 100644 Classes/Base.lproj/IncomingCallViewController~ipad.xib
 delete mode 100644 Classes/Base.lproj/WizardViewController~ipad.xib
 delete mode 100644 Classes/FirstLoginViewController.h
 delete mode 100644 Classes/FirstLoginViewController.m
 delete mode 100644 Classes/ar.lproj/DialerViewController~ipad.strings
 delete mode 100644 Classes/ar.lproj/FirstLoginViewController.strings
 delete mode 100644 Classes/ar.lproj/IncomingCallViewController~ipad.strings
 delete mode 100644 Classes/ar.lproj/WizardViewController~ipad.strings
 delete mode 100644 Classes/fr.lproj/DialerViewController~ipad.strings
 delete mode 100644 Classes/fr.lproj/FirstLoginViewController.strings
 delete mode 100644 Classes/fr.lproj/IncomingCallViewController~ipad.strings
 delete mode 100644 Classes/fr.lproj/WizardViewController~ipad.strings
 delete mode 100644 Classes/ru.lproj/DialerViewController~ipad.strings
 delete mode 100644 Classes/ru.lproj/FirstLoginViewController.strings
 delete mode 100644 Classes/ru.lproj/IncomingCallViewController~ipad.strings
 delete mode 100644 Classes/ru.lproj/WizardViewController~ipad.strings

diff --git a/Classes/Base.lproj/ChatRoomViewController.xib b/Classes/Base.lproj/ChatRoomViewController.xib
index 147925813..7bcc87e71 100644
--- a/Classes/Base.lproj/ChatRoomViewController.xib
+++ b/Classes/Base.lproj/ChatRoomViewController.xib
@@ -35,14 +35,17 @@
                             <rect key="frame" x="0.0" y="0.0" width="375" height="40"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="v5G-Qf-X82" userLabel="backgroundColor">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="40"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                </imageView>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="9" userLabel="backButton" customClass="UIIconButton">
                                     <rect key="frame" x="0.0" y="0.0" width="72" height="40"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="deviceRGB"/>
                                     <accessibility key="accessibilityConfiguration" label="Back"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="back.png" backgroundImage="color_F.png">
+                                    <state key="normal" image="back.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
@@ -53,11 +56,10 @@
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="10" userLabel="editButton" customClass="UIToggleButton">
                                     <rect key="frame" x="303" y="0.0" width="72" height="40"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                                    <color key="backgroundColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
                                     <accessibility key="accessibilityConfiguration" label="Edit"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="edit_list.png" backgroundImage="color_F.png">
+                                    <state key="normal" image="edit_list.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
@@ -66,7 +68,6 @@
                                     </connections>
                                 </button>
                             </subviews>
-                            <color key="backgroundColor" red="0.76862745099999996" green="0.76862745099999996" blue="0.76862745099999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </view>
                         <view contentMode="scaleToFill" id="49" userLabel="chatView">
                             <rect key="frame" x="0.0" y="44" width="375" height="515"/>
diff --git a/Classes/Base.lproj/ChatViewController.xib b/Classes/Base.lproj/ChatViewController.xib
index 9a4a3be0c..247ffdac9 100644
--- a/Classes/Base.lproj/ChatViewController.xib
+++ b/Classes/Base.lproj/ChatViewController.xib
@@ -28,16 +28,20 @@
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
                         <view contentMode="scaleToFill" id="7" userLabel="toolsBar">
-                            <rect key="frame" x="0.0" y="0.0" width="374.99999173369122" height="42"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="42"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="jVg-vj-VOw" userLabel="backgroundColor">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="42"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                </imageView>
                                 <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="10" userLabel="backButton">
                                     <rect key="frame" x="0.0" y="0.0" width="75" height="42"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="New Discussion"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="back.png" backgroundImage="color_F.png">
+                                    <state key="normal" image="back.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
                                     <connections>
@@ -50,7 +54,7 @@
                                     <accessibility key="accessibilityConfiguration" label="New Discussion"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="chat_add.png" backgroundImage="color_F.png">
+                                    <state key="normal" image="chat_add.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
                                     <connections>
@@ -58,22 +62,22 @@
                                     </connections>
                                 </button>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="9" userLabel="selectAllButton" customClass="UIToggleButton">
-                                    <rect key="frame" x="211" y="0.0" width="75.999997811012364" height="42"/>
+                                    <rect key="frame" x="211.00000607732113" y="0.0" width="76" height="42"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Edit"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="select_all.png" backgroundImage="color_F.png">
+                                    <state key="normal" image="select_all.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
                                 </button>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="UxT-TB-Ri4" userLabel="editButton" customClass="UIToggleButton">
-                                    <rect key="frame" x="300" y="0.0" width="74.999991733691232" height="42"/>
+                                    <rect key="frame" x="300" y="0.0" width="75" height="42"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Edit"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="edit_list.png" backgroundImage="color_F.png">
+                                    <state key="normal" image="edit_list.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
                                     <connections>
@@ -81,17 +85,16 @@
                                     </connections>
                                 </button>
                                 <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="e4g-nB-qYa" userLabel="deleteButton" customClass="UIToggleButton">
-                                    <rect key="frame" x="300" y="0.0" width="74.999991733691232" height="42"/>
+                                    <rect key="frame" x="300" y="0.0" width="75" height="42"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Edit"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="delete.png" backgroundImage="color_F.png">
+                                    <state key="normal" image="delete.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
                                 </button>
                             </subviews>
-                            <color key="backgroundColor" red="0.90588235294117647" green="0.90588235294117647" blue="0.90588235294117647" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </view>
                         <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="60" sectionHeaderHeight="22" sectionFooterHeight="22" id="6" userLabel="tableView">
                             <rect key="frame" x="0.0" y="42" width="375" height="517"/>
@@ -106,7 +109,6 @@
                             </connections>
                         </tableView>
                     </subviews>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
diff --git a/Classes/Base.lproj/ContactDetailsLabelViewController.xib b/Classes/Base.lproj/ContactDetailsLabelViewController.xib
index 824c53ce1..137f12a87 100644
--- a/Classes/Base.lproj/ContactDetailsLabelViewController.xib
+++ b/Classes/Base.lproj/ContactDetailsLabelViewController.xib
@@ -20,41 +20,31 @@
                     <rect key="frame" x="0.0" y="42" width="375" height="559"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
-                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="background.png" id="16" userLabel="background">
-                            <rect key="frame" x="0.0" y="0.0" width="375" height="559"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            <accessibility key="accessibilityConfiguration" label=""/>
-                        </imageView>
                         <view contentMode="scaleToFill" id="6" userLabel="toolsBar">
-                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="42"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
-                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="toolsbar_background.png" id="10" userLabel="barBackground">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="fso-nh-iJP" userLabel="backgroundColor">
+                                    <rect key="frame" x="0.0" y="1" width="375" height="42"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 </imageView>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="8" userLabel="backButton">
-                                    <rect key="frame" x="0.0" y="0.0" width="160" height="44"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Back"/>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="bPy-1d-07h" userLabel="backButton">
+                                    <rect key="frame" x="0.0" y="1" width="75" height="40"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                                    <accessibility key="accessibilityConfiguration" label="New Discussion"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" title="Back" backgroundImage="contact_back_default.png">
-                                        <color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
+                                    <state key="normal" image="back.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
-                                    <state key="highlighted" backgroundImage="contact_back_over.png">
-                                        <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="deviceRGB"/>
-                                    </state>
                                     <connections>
-                                        <action selector="onBackClick:" destination="-1" eventType="touchUpInside" id="11"/>
+                                        <action selector="onBackClick:" destination="-1" eventType="touchUpInside" id="4zW-v3-vqp"/>
                                     </connections>
                                 </button>
                             </subviews>
-                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         </view>
                         <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="5" userLabel="tableView">
-                            <rect key="frame" x="0.0" y="59" width="375" height="500"/>
+                            <rect key="frame" x="0.0" y="42" width="375" height="517"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <color key="backgroundColor" red="0.93725490196078431" green="0.93725490196078431" blue="0.95686274509803926" alpha="1" colorSpace="calibratedRGB"/>
                             <inset key="contentInset" minX="0.0" minY="0.0" maxX="0.0" maxY="10"/>
@@ -73,10 +63,8 @@
         </view>
     </objects>
     <resources>
-        <image name="background.png" width="5" height="88"/>
-        <image name="contact_back_default.png" width="320" height="88"/>
-        <image name="contact_back_over.png" width="320" height="88"/>
-        <image name="toolsbar_background.png" width="5" height="88"/>
+        <image name="back.png" width="25" height="22"/>
+        <image name="color_F.png" width="1" height="1"/>
     </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
diff --git a/Classes/Base.lproj/ContactDetailsViewController.xib b/Classes/Base.lproj/ContactDetailsViewController.xib
index 3496d0035..7d979c7c2 100644
--- a/Classes/Base.lproj/ContactDetailsViewController.xib
+++ b/Classes/Base.lproj/ContactDetailsViewController.xib
@@ -26,6 +26,10 @@
                             <rect key="frame" x="0.0" y="0.0" width="375" height="42"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="Lb6-xa-LB6" userLabel="backgroundColor">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="42"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                </imageView>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="9" userLabel="backButton" customClass="UIIconButton">
                                     <rect key="frame" x="0.0" y="0.0" width="75" height="42"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
@@ -69,7 +73,6 @@
                                     </connections>
                                 </button>
                             </subviews>
-                            <color key="backgroundColor" red="0.89411764709999997" green="0.89411764709999997" blue="0.89411764709999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </view>
                         <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" allowsSelectionDuringEditing="YES" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="19" userLabel="tableView">
                             <rect key="frame" x="0.0" y="44" width="375" height="515"/>
@@ -99,6 +102,7 @@
     </objects>
     <resources>
         <image name="back.png" width="25" height="22"/>
+        <image name="color_F.png" width="1" height="1"/>
         <image name="delete.png" width="22" height="28"/>
         <image name="edit.png" width="30" height="30"/>
     </resources>
diff --git a/Classes/Base.lproj/ContactsViewController.xib b/Classes/Base.lproj/ContactsViewController.xib
index 423fb9663..50823136a 100644
--- a/Classes/Base.lproj/ContactsViewController.xib
+++ b/Classes/Base.lproj/ContactsViewController.xib
@@ -37,12 +37,16 @@
                             <rect key="frame" x="0.0" y="0.0" width="375" height="42"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="Ehd-EB-dCJ" userLabel="backgroundColor">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="42"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                </imageView>
                                 <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="87" userLabel="backButton" customClass="UIIconButton">
                                     <rect key="frame" x="0.0" y="0.0" width="75" height="42"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Back"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="back.png" backgroundImage="color_F.png">
+                                    <state key="normal" image="back.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
@@ -61,7 +65,7 @@
                                             <fontDescription key="fontDescription" type="system" pointSize="9"/>
                                             <inset key="titleEdgeInsets" minX="-38" minY="15" maxX="0.0" maxY="0.0"/>
                                             <inset key="imageEdgeInsets" minX="16" minY="0.0" maxX="0.0" maxY="0.0"/>
-                                            <state key="normal" title="ALL" image="contacts_all_default.png" backgroundImage="color_F.png">
+                                            <state key="normal" title="ALL" image="contacts_all_default.png">
                                                 <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                                 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                             </state>
@@ -80,7 +84,7 @@
                                             <fontDescription key="fontDescription" type="system" pointSize="9"/>
                                             <inset key="titleEdgeInsets" minX="-35" minY="15" maxX="0.0" maxY="0.0"/>
                                             <inset key="imageEdgeInsets" minX="16" minY="0.0" maxX="0.0" maxY="0.0"/>
-                                            <state key="normal" title="SIP" image="contacts_sip_default.png" backgroundImage="color_F.png">
+                                            <state key="normal" title="SIP" image="contacts_sip_default.png">
                                                 <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                                 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                             </state>
@@ -99,7 +103,7 @@
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Add contact"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="edit_list.png" backgroundImage="color_F.png">
+                                    <state key="normal" image="edit_list.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
@@ -109,7 +113,7 @@
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Add contact"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="contact_add.png" backgroundImage="color_F.png">
+                                    <state key="normal" image="contact_add.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
@@ -122,13 +126,12 @@
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Add contact"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="delete.png" backgroundImage="color_F.png">
+                                    <state key="normal" image="delete.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
                                 </button>
                             </subviews>
-                            <color key="backgroundColor" red="0.88235294119999996" green="0.88235294119999996" blue="0.88235294119999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </view>
                         <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="zOo-FS-W6l" userLabel="tableView">
                             <rect key="frame" x="0.0" y="86" width="375" height="475"/>
diff --git a/Classes/Base.lproj/DialerViewController.xib b/Classes/Base.lproj/DialerViewController.xib
index 38b8a2739..351f89005 100644
--- a/Classes/Base.lproj/DialerViewController.xib
+++ b/Classes/Base.lproj/DialerViewController.xib
@@ -42,6 +42,10 @@
                             <rect key="frame" x="0.0" y="0.0" width="375" height="66"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="56Z-ia-Pln" userLabel="backgroundColor">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="66"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                </imageView>
                                 <textField opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter SIP address or phone number" minimumFontSize="5" id="4" userLabel="addressField" customClass="UIAddressTextField">
                                     <rect key="frame" x="0.0" y="0.0" width="312" height="63"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
@@ -66,7 +70,6 @@
                                     </connections>
                                 </button>
                             </subviews>
-                            <color key="backgroundColor" red="0.88235294119999996" green="0.88235294119999996" blue="0.88235294119999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </view>
                         <view contentMode="scaleToFill" id="180" userLabel="pad">
                             <rect key="frame" x="0.0" y="66" width="375" height="428"/>
diff --git a/Classes/Base.lproj/DialerViewController~ipad.xib b/Classes/Base.lproj/DialerViewController~ipad.xib
deleted file mode 100644
index a2a75db10..000000000
--- a/Classes/Base.lproj/DialerViewController~ipad.xib
+++ /dev/null
@@ -1,412 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DialerViewController">
-            <connections>
-                <outlet property="addCallButton" destination="23" id="42"/>
-                <outlet property="addContactButton" destination="24" id="43"/>
-                <outlet property="addressField" destination="6" id="44"/>
-                <outlet property="backButton" destination="22" id="69"/>
-                <outlet property="backgroundView" destination="76" id="77"/>
-                <outlet property="callButton" destination="21" id="45"/>
-                <outlet property="eightButton" destination="13" id="47"/>
-                <outlet property="eraseButton" destination="25" id="48"/>
-                <outlet property="fiveButton" destination="16" id="49"/>
-                <outlet property="fourButton" destination="15" id="50"/>
-                <outlet property="nineButton" destination="12" id="51"/>
-                <outlet property="oneButton" destination="19" id="52"/>
-                <outlet property="sevenButton" destination="14" id="53"/>
-                <outlet property="sharpButton" destination="11" id="54"/>
-                <outlet property="sixButton" destination="9" id="55"/>
-                <outlet property="starButton" destination="8" id="56"/>
-                <outlet property="threeButton" destination="17" id="57"/>
-                <outlet property="transferButton" destination="20" id="58"/>
-                <outlet property="twoButton" destination="18" id="59"/>
-                <outlet property="videoCameraSwitch" destination="71" id="74"/>
-                <outlet property="videoPreview" destination="70" id="75"/>
-                <outlet property="view" destination="2" id="60"/>
-                <outlet property="zeroButton" destination="10" id="61"/>
-            </connections>
-        </placeholder>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="2">
-            <rect key="frame" x="0.0" y="0.0" width="768" height="900"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-            <subviews>
-                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="logo_linphone_trame_background.png" id="78" userLabel="backgroundImage">
-                    <rect key="frame" x="127" y="200" width="510" height="460"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                </imageView>
-                <view contentMode="scaleToFill" id="76" userLabel="backgroundView">
-                    <rect key="frame" x="0.0" y="0.0" width="768" height="900"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                    <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                </view>
-                <view contentMode="scaleAspectFill" id="70" userLabel="preview">
-                    <rect key="frame" x="0.0" y="58" width="768" height="842"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                </view>
-                <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="71" userLabel="videoCameraSwitch" customClass="UICamSwitch">
-                    <rect key="frame" x="20" y="90" width="85" height="33"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <accessibility key="accessibilityConfiguration" label="Switch camera"/>
-                    <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                    <state key="normal" backgroundImage="switch_camera_default.png">
-                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                    </state>
-                    <state key="highlighted" backgroundImage="switch_camera_over.png"/>
-                    <connections>
-                        <outlet property="preview" destination="70" id="72"/>
-                    </connections>
-                </button>
-                <view contentMode="scaleToFill" id="5" userLabel="dialer">
-                    <rect key="frame" x="0.0" y="0.0" width="768" height="80"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                    <subviews>
-                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="dialer_address_background.png" id="7" userLabel="background">
-                            <rect key="frame" x="0.0" y="0.0" width="768" height="80"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                        </imageView>
-                        <textField opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter SIP address or phone number" adjustsFontSizeToFit="NO" minimumFontSize="15" id="6" userLabel="addressField" customClass="UIAddressTextField">
-                            <rect key="frame" x="0.0" y="0.0" width="700" height="60"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                            <accessibility key="accessibilityConfiguration" label="Enter an address"/>
-                            <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                            <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="36"/>
-                            <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="emailAddress"/>
-                            <connections>
-                                <action selector="onAddressChange:" destination="-1" eventType="editingChanged" id="65"/>
-                            </connections>
-                        </textField>
-                        <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="25" userLabel="backspaceButton" customClass="UIEraseButton">
-                            <rect key="frame" x="698" y="4" width="70" height="51"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Backscape"/>
-                            <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                            <inset key="contentEdgeInsets" minX="15" minY="15" maxX="15" maxY="15"/>
-                            <state key="normal" image="backspace_default.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="disabled" image="backspace_disabled.png"/>
-                            <state key="highlighted" image="backspace_over.png"/>
-                            <connections>
-                                <outlet property="addressField" destination="6" id="39"/>
-                            </connections>
-                        </button>
-                    </subviews>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                </view>
-                <view contentMode="scaleToFill" id="4" userLabel="pad">
-                    <rect key="frame" x="0.0" y="640" width="320" height="260"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <subviews>
-                        <imageView userInteractionEnabled="NO" tag="2" contentMode="scaleToFill" image="background_alt.png" id="73" userLabel="background">
-                            <rect key="frame" x="0.0" y="0.0" width="320" height="280"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        </imageView>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="19" userLabel="1" customClass="UIDigitButtonLongVoiceMail">
-                            <rect key="frame" x="0.0" y="11" 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"/>
-                            <accessibility key="accessibilityConfiguration" label="1"/>
-                            <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"/>
-                            <connections>
-                                <outlet property="addressField" destination="6" id="34"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="18" userLabel="2" customClass="UIDigitButton">
-                            <rect key="frame" x="107" y="11" width="106" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="2"/>
-                            <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"/>
-                            <connections>
-                                <outlet property="addressField" destination="6" id="33"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="17" userLabel="3" customClass="UIDigitButton">
-                            <rect key="frame" x="213" y="11" width="107" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="3"/>
-                            <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"/>
-                            <connections>
-                                <outlet property="addressField" destination="6" id="26"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="15" userLabel="4" customClass="UIDigitButton">
-                            <rect key="frame" x="0.0" y="73" width="107" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="4"/>
-                            <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"/>
-                            <connections>
-                                <outlet property="addressField" destination="6" id="27"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="16" userLabel="5" customClass="UIDigitButton">
-                            <rect key="frame" x="107" y="73" width="106" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="5"/>
-                            <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"/>
-                            <connections>
-                                <outlet property="addressField" destination="6" id="28"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="9" userLabel="6" customClass="UIDigitButton">
-                            <rect key="frame" x="213" y="73" width="107" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="6"/>
-                            <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"/>
-                            <connections>
-                                <outlet property="addressField" destination="6" id="29"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="14" userLabel="7" customClass="UIDigitButton">
-                            <rect key="frame" x="0.0" y="135" width="107" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="7"/>
-                            <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"/>
-                            <connections>
-                                <outlet property="addressField" destination="6" id="30"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="13" userLabel="8" customClass="UIDigitButton">
-                            <rect key="frame" x="107" y="135" width="106" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="8"/>
-                            <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"/>
-                            <connections>
-                                <outlet property="addressField" destination="6" id="31"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="12" userLabel="9" customClass="UIDigitButton">
-                            <rect key="frame" x="213" y="135" width="107" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="9"/>
-                            <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"/>
-                            <connections>
-                                <outlet property="addressField" destination="6" id="32"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="8" userLabel="*" customClass="UIDigitButton">
-                            <rect key="frame" x="0.0" y="197" width="107" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Star"/>
-                            <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"/>
-                            <connections>
-                                <outlet property="addressField" destination="6" id="35"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="10" userLabel="0" customClass="UIDigitButtonLongPlus">
-                            <rect key="frame" x="107" y="197" width="106" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="0"/>
-                            <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"/>
-                            <connections>
-                                <outlet property="addressField" destination="6" id="36"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="11" userLabel="#" customClass="UIDigitButton">
-                            <rect key="frame" x="213" y="197" width="107" height="54"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Sharp"/>
-                            <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"/>
-                            <connections>
-                                <outlet property="addressField" destination="6" id="37"/>
-                            </connections>
-                        </button>
-                    </subviews>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                </view>
-                <view contentMode="scaleToFill" id="3" userLabel="toolBar">
-                    <rect key="frame" x="456" y="815" width="312" height="85"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
-                    <subviews>
-                        <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="24" userLabel="addContactButton">
-                            <rect key="frame" x="0.0" y="0.0" width="126" height="85"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Add to Contact"/>
-                            <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                            <state key="normal" image="add_contact_default.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="disabled" image="add_contact_disabled.png"/>
-                            <state key="highlighted" image="add_contact_over.png"/>
-                            <connections>
-                                <action selector="onAddContactClick:" destination="-1" eventType="touchUpInside" id="63"/>
-                            </connections>
-                        </button>
-                        <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="22" userLabel="backButton">
-                            <rect key="frame" x="0.0" y="0.0" width="126" height="85"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Back"/>
-                            <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                            <state key="normal" image="back_default.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="disabled" image="back_disabled.png"/>
-                            <state key="highlighted" image="back_over.png"/>
-                            <connections>
-                                <action selector="onBackClick:" destination="-1" eventType="touchUpInside" id="68"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="21" userLabel="callButton" customClass="UICallButton">
-                            <rect key="frame" x="126" y="0.0" width="186" height="85"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Call"/>
-                            <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                            <state key="normal" image="call_default.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="disabled" image="call_disabled.png"/>
-                            <state key="highlighted" image="call_over.png"/>
-                            <connections>
-                                <outlet property="addressField" destination="6" id="40"/>
-                            </connections>
-                        </button>
-                        <button hidden="YES" opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="23" userLabel="addCallButton" customClass="UICallButton">
-                            <rect key="frame" x="126" y="0.0" width="186" height="85"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Add call"/>
-                            <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                            <state key="normal" image="add_call_default.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="disabled" image="add_call_disabled.png"/>
-                            <state key="highlighted" image="add_call_over.png"/>
-                            <connections>
-                                <outlet property="addressField" destination="6" id="38"/>
-                            </connections>
-                        </button>
-                        <button hidden="YES" opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="20" userLabel="transferButton" customClass="UITransferButton">
-                            <rect key="frame" x="126" y="0.0" width="186" height="85"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Transfer Call"/>
-                            <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                            <state key="normal" image="transfer_call_default.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="disabled" image="transfer_call_disabled.png"/>
-                            <state key="highlighted" image="transfer_call_over.png"/>
-                            <connections>
-                                <outlet property="addressField" destination="6" id="41"/>
-                            </connections>
-                        </button>
-                    </subviews>
-                    <color key="backgroundColor" white="1" alpha="0.0" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                </view>
-            </subviews>
-            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-            <nil key="simulatedStatusBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="414" y="375"/>
-        </view>
-    </objects>
-    <resources>
-        <image name="add_call_default.png" width="371" height="170"/>
-        <image name="add_call_disabled.png" width="371" height="170"/>
-        <image name="add_call_over.png" width="371" height="170"/>
-        <image name="add_contact_default.png" width="251" height="170"/>
-        <image name="add_contact_disabled.png" width="251" height="170"/>
-        <image name="add_contact_over.png" width="251" height="170"/>
-        <image name="back_default.png" width="251" height="170"/>
-        <image name="back_disabled.png" width="251" height="170"/>
-        <image name="back_over.png" width="251" height="170"/>
-        <image name="background_alt.png" width="640" height="561"/>
-        <image name="backspace_default.png" width="81" height="43"/>
-        <image name="backspace_disabled.png" width="81" height="43"/>
-        <image name="backspace_over.png" width="106" height="56"/>
-        <image name="call_default.png" width="371" height="170"/>
-        <image name="call_disabled.png" width="371" height="170"/>
-        <image name="call_over.png" width="371" height="170"/>
-        <image name="dialer_address_background.png" width="1536" height="117"/>
-        <image name="logo_linphone_trame_background.png" width="1019" height="920"/>
-        <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_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_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="switch_camera_default.png" width="151" height="149"/>
-        <image name="switch_camera_over.png" width="151" height="149"/>
-        <image name="transfer_call_default.png" width="371" height="170"/>
-        <image name="transfer_call_disabled.png" width="371" height="170"/>
-        <image name="transfer_call_over.png" width="371" height="170"/>
-    </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination"/>
-    </simulatedMetricsContainer>
-</document>
diff --git a/Classes/Base.lproj/FirstLoginViewController.xib b/Classes/Base.lproj/FirstLoginViewController.xib
deleted file mode 100644
index 073ec166e..000000000
--- a/Classes/Base.lproj/FirstLoginViewController.xib
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="FirstLoginViewController">
-            <connections>
-                <outlet property="loginButton" destination="64" id="65"/>
-                <outlet property="passwordField" destination="8" id="60"/>
-                <outlet property="siteButton" destination="35" id="58"/>
-                <outlet property="usernameField" destination="6" id="59"/>
-                <outlet property="view" destination="55" id="56"/>
-                <outlet property="waitView" destination="31" id="57"/>
-            </connections>
-        </placeholder>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="Aln-dF-qLE" userLabel="iphone6MetricsView">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-            <subviews>
-                <view contentMode="scaleToFill" id="55">
-                    <rect key="frame" x="0.0" y="42" width="375" height="559"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <subviews>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="64" userLabel="loginButton">
-                            <rect key="frame" x="61" y="388" width="255" height="50"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Login"/>
-                            <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
-                            <state key="normal" title="Login" backgroundImage="button_background_default.png">
-                                <color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" backgroundImage="button_background_over.png">
-                                <color key="titleColor" red="0.72549019609999998" green="0.76862745099999996" blue="0.79607843140000001" alpha="1" colorSpace="deviceRGB"/>
-                            </state>
-                            <connections>
-                                <action selector="onLoginClick:" destination="-1" eventType="touchUpInside" id="66"/>
-                            </connections>
-                        </button>
-                        <button hidden="YES" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="35" userLabel="siteButton">
-                            <rect key="frame" x="88" y="519" width="200" height="37"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
-                            <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
-                            <state key="normal">
-                                <color key="titleColor" red="0.19607843" green="0.30980393000000001" blue="0.52156866000000002" alpha="1" colorSpace="calibratedRGB"/>
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted">
-                                <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <connections>
-                                <action selector="onSiteClick:" destination="-1" eventType="touchUpInside" id="63"/>
-                            </connections>
-                        </button>
-                        <textField opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Username" minimumFontSize="17" background="field_background.png" id="6" userLabel="usernameField">
-                            <rect key="frame" x="88" y="210" width="200" height="31"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Username"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <textInputTraits key="textInputTraits" autocorrectionType="no"/>
-                            <connections>
-                                <outlet property="delegate" destination="-1" id="39"/>
-                            </connections>
-                        </textField>
-                        <textField opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" placeholder="Password" clearsOnBeginEditing="YES" minimumFontSize="17" background="field_background.png" id="8" userLabel="passwordField">
-                            <rect key="frame" x="88" y="270" width="200" height="31"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Password"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <textInputTraits key="textInputTraits" autocorrectionType="no" secureTextEntry="YES"/>
-                            <connections>
-                                <outlet property="delegate" destination="-1" id="17"/>
-                            </connections>
-                        </textField>
-                        <view hidden="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="31" userLabel="waitView">
-                            <rect key="frame" x="0.0" y="0.0" width="375" height="559"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            <subviews>
-                                <activityIndicatorView opaque="NO" clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleToFill" animating="YES" style="whiteLarge" id="32" userLabel="activityIndicator">
-                                    <rect key="frame" x="170" y="260" width="37" height="37"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                                </activityIndicatorView>
-                            </subviews>
-                            <color key="backgroundColor" white="1" alpha="0.66000000000000003" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                        </view>
-                    </subviews>
-                    <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"/>
-        </view>
-    </objects>
-    <resources>
-        <image name="button_background_default.png" width="5" height="88"/>
-        <image name="button_background_over.png" width="550" height="101"/>
-        <image name="field_background.png" width="542" height="88"/>
-    </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
-</document>
diff --git a/Classes/Base.lproj/HistoryDetailsViewController.xib b/Classes/Base.lproj/HistoryDetailsViewController.xib
index f5204aaae..c7c80de01 100644
--- a/Classes/Base.lproj/HistoryDetailsViewController.xib
+++ b/Classes/Base.lproj/HistoryDetailsViewController.xib
@@ -29,6 +29,10 @@
                             <rect key="frame" x="0.0" y="0.0" width="375" height="40"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="gee-PW-IqY" userLabel="backgroundColor">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="42"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                </imageView>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="9" userLabel="backButton" customClass="UIIconButton">
                                     <rect key="frame" x="0.0" y="0.0" width="72" height="40"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -50,14 +54,13 @@
                                     </connections>
                                 </button>
                             </subviews>
-                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         </view>
                         <view contentMode="scaleToFill" id="33" userLabel="headerView">
                             <rect key="frame" x="0.0" y="40" width="375" height="150"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="avatar.png" id="23" userLabel="avatarImage" customClass="UIRoundedImageView">
-                                    <rect key="frame" x="150" y="0.0" width="68" height="66"/>
+                                    <rect key="frame" x="150" y="1" width="68" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Contact avatar">
                                         <accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
@@ -154,6 +157,7 @@
         <image name="back.png" width="25" height="22"/>
         <image name="call_start_body_default.png" width="52" height="52"/>
         <image name="chat_start_body_default.png" width="52" height="52"/>
+        <image name="color_F.png" width="1" height="1"/>
         <image name="contact_add.png" width="35" height="30"/>
         <image name="linphone_user.png" width="27" height="23"/>
     </resources>
diff --git a/Classes/Base.lproj/HistoryViewController.xib b/Classes/Base.lproj/HistoryViewController.xib
index 9fa97a719..574286a6c 100644
--- a/Classes/Base.lproj/HistoryViewController.xib
+++ b/Classes/Base.lproj/HistoryViewController.xib
@@ -29,12 +29,16 @@
                             <rect key="frame" x="0.0" y="0.0" width="375" height="40"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="upG-IP-6mg" userLabel="backgroundColor">
+                                    <rect key="frame" x="0.0" y="-1" width="375" height="42"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                </imageView>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="35" userLabel="deleteButton" customClass="UIIconButton">
                                     <rect key="frame" x="0.0" y="0.0" width="94" height="40"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Delete all"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="delete.png" backgroundImage="color_F.png">
+                                    <state key="normal" image="delete.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
                                     <state key="selected" backgroundImage="color_E.png"/>
@@ -51,7 +55,7 @@
                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                             <accessibility key="accessibilityConfiguration" label="All contacts filter"/>
                                             <inset key="titleEdgeInsets" minX="0.0" minY="16" maxX="0.0" maxY="0.0"/>
-                                            <state key="normal" image="history_all_default.png" backgroundImage="color_F.png">
+                                            <state key="normal" image="history_all_default.png">
                                                 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                             </state>
                                             <state key="selected" image="history_all_selected.png" backgroundImage="color_E.png"/>
@@ -64,7 +68,7 @@
                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                             <accessibility key="accessibilityConfiguration" label="Missed contacts filter"/>
                                             <inset key="titleEdgeInsets" minX="0.0" minY="16" maxX="0.0" maxY="0.0"/>
-                                            <state key="normal" image="history_missed_default.png" backgroundImage="color_F.png">
+                                            <state key="normal" image="history_missed_default.png">
                                                 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                             </state>
                                             <state key="selected" image="history_missed_selected.png" backgroundImage="color_E.png"/>
@@ -73,14 +77,13 @@
                                             </connections>
                                         </button>
                                     </subviews>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                                 </view>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="6" userLabel="editButton" customClass="UIToggleButton">
                                     <rect key="frame" x="281" y="0.0" width="94" height="40"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Edit"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="edit_list.png" backgroundImage="color_F.png">
+                                    <state key="normal" image="edit_list.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
                                     <state key="selected" backgroundImage="color_E.png"/>
@@ -89,7 +92,6 @@
                                     </connections>
                                 </button>
                             </subviews>
-                            <color key="backgroundColor" red="0.88235294119999996" green="0.88235294119999996" blue="0.88235294119999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </view>
                         <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="17" userLabel="tableView">
                             <rect key="frame" x="0.0" y="40" width="375" height="519"/>
diff --git a/Classes/Base.lproj/ImageViewController.xib b/Classes/Base.lproj/ImageViewController.xib
index 4c7c3be2c..b77debdc4 100644
--- a/Classes/Base.lproj/ImageViewController.xib
+++ b/Classes/Base.lproj/ImageViewController.xib
@@ -7,7 +7,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ImageViewController">
             <connections>
-                <outlet property="backButton" destination="7" id="8"/>
+                <outlet property="backButton" destination="RW1-kp-wn7" id="DJc-Ps-J3p"/>
                 <outlet property="scrollView" destination="12" id="13"/>
                 <outlet property="view" destination="1" id="3"/>
             </connections>
@@ -21,36 +21,31 @@
                     <rect key="frame" x="0.0" y="42" width="375" height="559"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
-                        <view contentMode="scaleToFill" id="11" userLabel="toolbar">
-                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                        <view contentMode="scaleToFill" id="2E4-s5-jYL" userLabel="toolsBar">
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="42"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
-                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="toolsbar_background.png" id="6" userLabel="background">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="Rir-PV-D7o" userLabel="backgroundColor">
+                                    <rect key="frame" x="0.0" y="1" width="375" height="42"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 </imageView>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="7" userLabel="backButton">
-                                    <rect key="frame" x="0.0" y="0.0" width="160" height="44"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Back"/>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="RW1-kp-wn7" userLabel="backButton">
+                                    <rect key="frame" x="0.0" y="1" width="75" height="40"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                                    <accessibility key="accessibilityConfiguration" label="New Discussion"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" title="Back" backgroundImage="image_back_default.png">
-                                        <color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
+                                    <state key="normal" image="back.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
-                                    <state key="highlighted" backgroundImage="image_back_over.png">
-                                        <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="deviceRGB"/>
-                                    </state>
                                     <connections>
-                                        <action selector="onBackClick:" destination="-1" eventType="touchUpInside" id="10"/>
+                                        <action selector="onBackClick:" destination="-1" eventType="touchUpInside" id="vyb-kn-xSQ"/>
                                     </connections>
                                 </button>
                             </subviews>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         </view>
                         <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" minimumZoomScale="0.0" maximumZoomScale="10" id="12" userLabel="scrollView" customClass="UIImageScrollView">
-                            <rect key="frame" x="0.0" y="44" width="375" height="515"/>
+                            <rect key="frame" x="0.0" y="42" width="375" height="517"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                         </scrollView>
@@ -63,9 +58,8 @@
         </view>
     </objects>
     <resources>
-        <image name="image_back_default.png" width="320" height="88"/>
-        <image name="image_back_over.png" width="320" height="88"/>
-        <image name="toolsbar_background.png" width="5" height="88"/>
+        <image name="back.png" width="25" height="22"/>
+        <image name="color_F.png" width="1" height="1"/>
     </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
diff --git a/Classes/Base.lproj/InCallViewController.xib b/Classes/Base.lproj/InCallViewController.xib
index 0c98a5549..dbfbcebad 100644
--- a/Classes/Base.lproj/InCallViewController.xib
+++ b/Classes/Base.lproj/InCallViewController.xib
@@ -67,7 +67,7 @@
                                             </accessibility>
                                         </view>
                                         <view contentMode="scaleAspectFit" id="127" userLabel="preview">
-                                            <rect key="frame" x="253.99998625559141" y="355.00002002077525" width="113" height="140"/>
+                                            <rect key="frame" x="254" y="355" width="113" height="140"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </view>
@@ -227,6 +227,10 @@
                             <rect key="frame" x="188" y="305" width="94" height="198"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                             <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="bqu-n4-WSS" userLabel="backgroundColor">
+                                    <rect key="frame" x="0.0" y="0.0" width="94" height="198"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                                </imageView>
                                 <button opaque="NO" tag="30" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="6uv-FV-mUL" userLabel="routesBluetoothButton">
                                     <rect key="frame" x="0.0" y="0.0" width="94" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -279,12 +283,15 @@
                                     </state>
                                 </button>
                             </subviews>
-                            <color key="backgroundColor" red="0.88235294119999996" green="0.88235294119999996" blue="0.88235294119999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </view>
                         <view tag="15" contentMode="scaleToFill" id="sHZ-53-Hta" userLabel="optionsView">
                             <rect key="frame" x="282" y="305" width="94" height="198"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                             <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="WcD-wQ-0ml" userLabel="backgroundColor">
+                                    <rect key="frame" x="0.0" y="0.0" width="94" height="198"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                                </imageView>
                                 <button opaque="NO" tag="25" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="06a-kv-hpZ" userLabel="optionConferenceButton" customClass="UIIconButton">
                                     <rect key="frame" x="0.0" y="0.0" width="94" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
@@ -321,102 +328,116 @@
                                     </state>
                                 </button>
                             </subviews>
-                            <color key="backgroundColor" red="0.88235294119999996" green="0.88235294119999996" blue="0.88235294119999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </view>
                         <view tag="18" contentMode="scaleToFill" id="mga-O5-mUn" userLabel="mainBar">
                             <rect key="frame" x="0.0" y="503" width="375" height="122"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                             <subviews>
-                                <button opaque="NO" tag="19" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="HDb-mD-sWV" userLabel="videoButton" customClass="UIVideoButton">
-                                    <rect key="frame" x="0.0" y="0.0" width="94" height="66"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Video"/>
-                                    <inset key="titleEdgeInsets" minX="0.0" minY="38" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="camera_default.png" backgroundImage="color_F.png">
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                    </state>
-                                    <state key="selected" image="camera_selected.png"/>
-                                    <state key="highlighted" backgroundImage="color_L.png"/>
-                                    <connections>
-                                        <outlet property="waitView" destination="HIj-5b-rGP" id="wfm-ep-9QC"/>
-                                    </connections>
-                                </button>
-                                <activityIndicatorView hidden="YES" opaque="NO" tag="20" contentMode="scaleToFill" hidesWhenStopped="YES" style="whiteLarge" id="HIj-5b-rGP" userLabel="videoWaitView">
-                                    <rect key="frame" x="26" y="20" width="37" height="37"/>
+                                <view contentMode="scaleToFill" id="OIH-ek-VgL">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="66"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                    <subviews>
+                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="Zhw-AK-YsQ" userLabel="backgroundColor">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="66"/>
+                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                        </imageView>
+                                        <button opaque="NO" tag="19" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="HDb-mD-sWV" userLabel="videoButton" customClass="UIVideoButton">
+                                            <rect key="frame" x="0.0" y="0.0" width="94" height="66"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                                            <accessibility key="accessibilityConfiguration" label="Video"/>
+                                            <inset key="titleEdgeInsets" minX="0.0" minY="38" maxX="0.0" maxY="0.0"/>
+                                            <state key="normal" image="camera_default.png">
+                                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            </state>
+                                            <state key="selected" image="camera_selected.png"/>
+                                            <state key="highlighted" backgroundImage="color_L.png"/>
+                                            <connections>
+                                                <outlet property="waitView" destination="HIj-5b-rGP" id="wfm-ep-9QC"/>
+                                            </connections>
+                                        </button>
+                                        <activityIndicatorView hidden="YES" opaque="NO" tag="20" contentMode="scaleToFill" hidesWhenStopped="YES" style="whiteLarge" id="HIj-5b-rGP" userLabel="videoWaitView">
+                                            <rect key="frame" x="26" y="15" 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="pRH-Ao-h65" userLabel="microButton" customClass="UIMicroButton">
+                                            <rect key="frame" x="94" y="0.0" width="94" height="66"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                                            <accessibility key="accessibilityConfiguration" label="Micro"/>
+                                            <inset key="titleEdgeInsets" minX="0.0" minY="38" maxX="0.0" maxY="0.0"/>
+                                            <state key="normal" image="micro_default.png">
+                                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            </state>
+                                            <state key="selected" image="micro_selected.png"/>
+                                            <state key="highlighted" backgroundImage="color_L.png"/>
+                                        </button>
+                                        <button opaque="NO" tag="22" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="F5S-kV-7Kv" userLabel="speakerButton" customClass="UISpeakerButton">
+                                            <rect key="frame" x="188" y="0.0" width="94" height="66"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                                            <accessibility key="accessibilityConfiguration" label="Speaker"/>
+                                            <inset key="titleEdgeInsets" minX="0.0" minY="38" maxX="0.0" maxY="0.0"/>
+                                            <state key="normal" image="speaker_default.png">
+                                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            </state>
+                                            <state key="selected" image="speaker_selected.png"/>
+                                            <state key="highlighted" backgroundImage="color_L.png"/>
+                                        </button>
+                                        <button hidden="YES" opaque="NO" tag="29" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="nQp-5y-kTy" userLabel="routesButton" customClass="UIToggleButton">
+                                            <rect key="frame" x="188" y="0.0" width="94" height="66"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                                            <accessibility key="accessibilityConfiguration" label="Route"/>
+                                            <inset key="titleEdgeInsets" minX="0.0" minY="38" maxX="0.0" maxY="0.0"/>
+                                            <state key="normal" image="speaker_default.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="8Zx-MI-pUL" userLabel="optionsButton" customClass="UIToggleButton">
+                                            <rect key="frame" x="282" y="0.0" width="94" height="66"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                                            <accessibility key="accessibilityConfiguration" label="Options"/>
+                                            <inset key="titleEdgeInsets" minX="0.0" minY="38" maxX="0.0" maxY="0.0"/>
+                                            <state key="normal" image="options_default.png">
+                                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            </state>
+                                            <state key="selected" image="options_selected.png"/>
+                                            <state key="highlighted" backgroundImage="color_L.png"/>
+                                        </button>
+                                    </subviews>
+                                </view>
+                                <view contentMode="scaleToFill" id="8q9-3P-Fz0">
+                                    <rect key="frame" x="0.0" y="66" width="375" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                </activityIndicatorView>
-                                <button opaque="NO" tag="21" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="pRH-Ao-h65" userLabel="microButton" customClass="UIMicroButton">
-                                    <rect key="frame" x="94" y="0.0" width="94" height="66"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Micro"/>
-                                    <inset key="titleEdgeInsets" minX="0.0" minY="38" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="micro_default.png" backgroundImage="color_F.png">
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                    </state>
-                                    <state key="selected" image="micro_selected.png"/>
-                                    <state key="highlighted" backgroundImage="color_L.png"/>
-                                </button>
-                                <button opaque="NO" tag="22" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="F5S-kV-7Kv" userLabel="speakerButton" customClass="UISpeakerButton">
-                                    <rect key="frame" x="188" y="0.0" width="94" height="66"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Speaker"/>
-                                    <inset key="titleEdgeInsets" minX="0.0" minY="38" maxX="0.0" maxY="0.0"/>
-                                    <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"/>
-                                    <state key="highlighted" backgroundImage="color_L.png"/>
-                                </button>
-                                <button hidden="YES" opaque="NO" tag="29" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="nQp-5y-kTy" userLabel="routesButton" customClass="UIToggleButton">
-                                    <rect key="frame" x="188" y="0.0" width="94" height="66"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Route"/>
-                                    <inset key="titleEdgeInsets" minX="0.0" minY="38" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="speaker_default.png" backgroundImage="color_F.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="8Zx-MI-pUL" userLabel="optionsButton" customClass="UIToggleButton">
-                                    <rect key="frame" x="282" y="0.0" width="94" height="66"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Options"/>
-                                    <inset key="titleEdgeInsets" minX="0.0" minY="38" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="options_default.png" backgroundImage="color_F.png">
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                    </state>
-                                    <state key="selected" image="options_selected.png"/>
-                                    <state key="highlighted" backgroundImage="color_L.png"/>
-                                </button>
-                                <button opaque="NO" tag="27" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="SRu-dB-r3e" userLabel="dialerButton" customClass="UIToggleButton">
-                                    <rect key="frame" x="0.0" y="66.000009695688732" width="94" height="66"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Back"/>
-                                    <state key="normal" image="footer_dialer.png" backgroundImage="color_C.png">
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                    </state>
-                                    <state key="highlighted" backgroundImage="color_L.png"/>
-                                </button>
-                                <button opaque="NO" tag="26" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Xpw-A4-BZO" userLabel="hangupButton" customClass="UIHangUpButton">
-                                    <rect key="frame" x="94" y="66.000009695688732" width="188" height="66"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Hangup"/>
-                                    <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="color_L.png"/>
-                                </button>
-                                <button opaque="NO" tag="26" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="t7u-65-OPV" userLabel="chatButton" customClass="UIIconButton">
-                                    <rect key="frame" x="282" y="66.000009695688732" width="94" height="66"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Hangup"/>
-                                    <state key="normal" image="footer_chat.png" backgroundImage="color_C.png">
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                    </state>
-                                    <state key="highlighted" backgroundImage="color_L.png"/>
-                                </button>
+                                    <subviews>
+                                        <button opaque="NO" tag="27" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="SRu-dB-r3e" userLabel="dialerButton" customClass="UIToggleButton">
+                                            <rect key="frame" x="0.0" y="0.0" width="94" height="66"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
+                                            <accessibility key="accessibilityConfiguration" label="Back"/>
+                                            <state key="normal" image="footer_dialer.png" backgroundImage="color_C.png">
+                                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            </state>
+                                            <state key="highlighted" backgroundImage="color_L.png"/>
+                                        </button>
+                                        <button opaque="NO" tag="26" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Xpw-A4-BZO" userLabel="hangupButton" customClass="UIHangUpButton">
+                                            <rect key="frame" x="94" y="0.0" width="188" height="66"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
+                                            <accessibility key="accessibilityConfiguration" label="Hangup"/>
+                                            <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="color_L.png"/>
+                                        </button>
+                                        <button opaque="NO" tag="26" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="t7u-65-OPV" userLabel="chatButton" customClass="UIIconButton">
+                                            <rect key="frame" x="282" y="0.0" width="94" height="66"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
+                                            <accessibility key="accessibilityConfiguration" label="Hangup"/>
+                                            <state key="normal" image="footer_chat.png" backgroundImage="color_C.png">
+                                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            </state>
+                                            <state key="highlighted" backgroundImage="color_L.png"/>
+                                        </button>
+                                    </subviews>
+                                </view>
                             </subviews>
-                            <color key="backgroundColor" red="0.88235294119999996" green="0.88235294119999996" blue="0.88235294119999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </view>
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
diff --git a/Classes/Base.lproj/IncomingCallViewController.xib b/Classes/Base.lproj/IncomingCallViewController.xib
index 994422954..7615542c4 100644
--- a/Classes/Base.lproj/IncomingCallViewController.xib
+++ b/Classes/Base.lproj/IncomingCallViewController.xib
@@ -23,15 +23,15 @@
                     <rect key="frame" x="0.0" y="42" width="375" height="625"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
-                        <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">
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="Cro-ww-VIC" userLabel="headerButton">
                             <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>
+                            <state key="normal" title="INCOMING CALL" backgroundImage="color_F.png">
+                                <color key="titleColor" red="1" green="0.36862745099999999" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                            </state>
+                        </button>
                         <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"/>
@@ -102,6 +102,7 @@
         <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_F.png" width="1" height="1"/>
         <image name="color_I.png" width="1" height="1"/>
         <image name="color_L.png" width="1" height="1"/>
     </resources>
diff --git a/Classes/Base.lproj/IncomingCallViewController~ipad.xib b/Classes/Base.lproj/IncomingCallViewController~ipad.xib
deleted file mode 100644
index c18514c0e..000000000
--- a/Classes/Base.lproj/IncomingCallViewController~ipad.xib
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="IncomingCallViewController">
-            <connections>
-                <outlet property="addressLabel" destination="9" id="14"/>
-                <outlet property="avatarImage" destination="19" id="20"/>
-                <outlet property="landscapeView" destination="61" id="75"/>
-                <outlet property="portraitView" destination="25" id="32"/>
-                <outlet property="view" destination="25" id="26"/>
-            </connections>
-        </placeholder>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="25" userLabel="Portrait View">
-            <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-            <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="768" height="958.00000000000011"/>
-                    <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="768" 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="768" 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="728" 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="748" 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" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <imageView userInteractionEnabled="NO" tag="6" contentMode="scaleToFill" image="avatar_shadow.png" id="18" userLabel="avatarShadowImage">
-                            <rect key="frame" x="224" 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="304" 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="947" width="768" height="77"/>
-                    <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="768" 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="384" 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="384" y="0.0" width="384" height="77"/>
-                            <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">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" backgroundImage="decline_over.png"/>
-                            <connections>
-                                <action selector="onDeclineClick:" destination="-1" eventType="touchUpInside" id="16"/>
-                            </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"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-        </view>
-        <view contentMode="scaleToFill" id="61" userLabel="Landscape View">
-            <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <view tag="1" contentMode="scaleToFill" id="62">
-                    <rect key="frame" x="0.0" y="0.0" width="1024" height="701.99999999999989"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                    <subviews>
-                        <imageView userInteractionEnabled="NO" tag="2" contentMode="scaleToFill" image="cell_call_first.png" id="72" userLabel="addressBackgroundImage">
-                            <rect key="frame" x="0.0" y="49" width="1024" height="63"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                        </imageView>
-                        <imageView userInteractionEnabled="NO" tag="3" contentMode="scaleToFill" image="header_incoming.png" id="68" userLabel="headerBackground">
-                            <rect key="frame" x="0.0" y="0.0" width="1024" 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="67" userLabel="headerLabel">
-                            <rect key="frame" x="20" y="0.0" width="984" 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="69" userLabel="addressLabel">
-                            <rect key="frame" x="10" y="53" width="1004" 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" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <imageView userInteractionEnabled="NO" tag="6" contentMode="scaleToFill" image="avatar_shadow.png" id="70" userLabel="avatarShadowImage">
-                            <rect key="frame" x="352" 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="71" userLabel="avatarImage">
-                            <rect key="frame" x="432" 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="63" userLabel="tabBar">
-                    <rect key="frame" x="0.0" y="682" width="1024" height="86"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                    <subviews>
-                        <view hidden="YES" userInteractionEnabled="NO" tag="-1" contentMode="scaleToFill" id="66" userLabel="mask">
-                            <rect key="frame" x="0.0" y="19" width="1024" 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="64" userLabel="acceptButton">
-                            <rect key="frame" x="0.0" y="0.0" width="512" height="86"/>
-                            <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_landscape.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" backgroundImage="accept_over_landscape.png"/>
-                            <connections>
-                                <action selector="onAcceptClick:" destination="-1" eventType="touchUpInside" id="73"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" tag="12" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="65" userLabel="declineButton">
-                            <rect key="frame" x="512" y="0.0" width="512" height="86"/>
-                            <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_landscape.png">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" backgroundImage="decline_over_landscape.png"/>
-                            <connections>
-                                <action selector="onDeclineClick:" destination="-1" eventType="touchUpInside" id="74"/>
-                            </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"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-        </view>
-    </objects>
-    <resources>
-        <image name="accept_default.png" width="320" height="154"/>
-        <image name="accept_default_landscape.png" width="1024" height="171"/>
-        <image name="accept_over.png" width="320" height="154"/>
-        <image name="accept_over_landscape.png" width="1024" height="171"/>
-        <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_default_landscape.png" width="1024" height="171"/>
-        <image name="decline_over.png" width="320" height="154"/>
-        <image name="decline_over_landscape.png" width="1024" height="171"/>
-        <image name="header_incoming.png" width="640" height="135"/>
-    </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
-</document>
diff --git a/Classes/Base.lproj/OutgoingCallViewController.xib b/Classes/Base.lproj/OutgoingCallViewController.xib
index df3cf32f1..06f1bff5a 100644
--- a/Classes/Base.lproj/OutgoingCallViewController.xib
+++ b/Classes/Base.lproj/OutgoingCallViewController.xib
@@ -23,15 +23,15 @@
                     <rect key="frame" x="0.0" y="42" width="375" height="625"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
-                        <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">
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="NFl-sb-0TV" userLabel="headerButton">
                             <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>
+                            <state key="normal" title="OUTGOING CALL" backgroundImage="color_F.png">
+                                <color key="titleColor" red="1" green="0.36862745099999999" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                            </state>
+                        </button>
                         <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"/>
@@ -58,12 +58,16 @@
                             <rect key="frame" x="0.0" y="562" width="375" height="63"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                             <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="vyh-Us-8kj" userLabel="backgroundColor">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="63"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                </imageView>
                                 <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" image="micro_default.png" backgroundImage="color_F.png">
+                                    <state key="normal" image="micro_default.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
                                     <state key="selected" image="micro_selected.png"/>
@@ -73,7 +77,7 @@
                                     <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">
+                                    <state key="normal" image="speaker_default.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
                                     <state key="selected" image="speaker_selected.png"/>
diff --git a/Classes/Base.lproj/PhoneMainView.xib b/Classes/Base.lproj/PhoneMainView.xib
index a4b3cdfb4..fc4bcf35d 100644
--- a/Classes/Base.lproj/PhoneMainView.xib
+++ b/Classes/Base.lproj/PhoneMainView.xib
@@ -21,11 +21,11 @@
                     <rect key="frame" x="0.0" y="42" width="375" height="559"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                     <subviews>
-                        <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="background.png" id="212" userLabel="background">
+                        <view tag="1" contentMode="scaleToFill" id="avX-6g-QDq" userLabel="background">
                             <rect key="frame" x="0.0" y="0.0" width="375" height="559"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                        </imageView>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        </view>
                         <view contentMode="scaleToFill" id="6sv-JD-j8Z" userLabel="statusBarBG">
                             <rect key="frame" x="0.0" y="0.0" width="375" height="20"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
@@ -43,9 +43,6 @@
             <nil key="simulatedStatusBarMetrics"/>
         </viewController>
     </objects>
-    <resources>
-        <image name="background.png" width="640" height="523"/>
-    </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>
diff --git a/Classes/Base.lproj/WizardViewController.xib b/Classes/Base.lproj/WizardViewController.xib
index 66b04fb9d..47eabc16d 100644
--- a/Classes/Base.lproj/WizardViewController.xib
+++ b/Classes/Base.lproj/WizardViewController.xib
@@ -26,12 +26,16 @@
                             <rect key="frame" x="0.0" y="0.0" width="375" height="63"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="vhv-dn-tHv" userLabel="backgroundColor">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="63"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                </imageView>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="TFl-cN-1Vb" userLabel="dialerBackButton" customClass="UIIconButton">
                                     <rect key="frame" x="300" y="0.0" width="75" height="63"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Add contact"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="dialer_back.png" backgroundImage="color_F.png">
+                                    <state key="normal" image="dialer_back.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
@@ -51,7 +55,7 @@
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Back"/>
                                     <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                                    <state key="normal" image="back.png" backgroundImage="color_F.png">
+                                    <state key="normal" image="back.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
@@ -60,7 +64,6 @@
                                     </connections>
                                 </button>
                             </subviews>
-                            <color key="backgroundColor" red="0.88235294119999996" green="0.88235294119999996" blue="0.88235294119999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </view>
                         <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" tag="1" contentMode="scaleToFill" bounces="NO" showsHorizontalScrollIndicator="NO" id="98" userLabel="contentView" customClass="TPKeyboardAvoidingScrollView">
                             <rect key="frame" x="0.0" y="63" width="375" height="562"/>
diff --git a/Classes/Base.lproj/WizardViewController~ipad.xib b/Classes/Base.lproj/WizardViewController~ipad.xib
deleted file mode 100644
index ab6d51252..000000000
--- a/Classes/Base.lproj/WizardViewController~ipad.xib
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="WizardViewController">
-            <connections>
-                <outlet property="backButton" destination="17" id="27"/>
-                <outlet property="contentView" destination="98" id="99"/>
-                <outlet property="landscapeView" destination="118" id="134"/>
-                <outlet property="portraitView" destination="12" id="117"/>
-                <outlet property="startButton" destination="16" id="26"/>
-                <outlet property="view" destination="12" id="20"/>
-                <outlet property="waitView" destination="129" id="131"/>
-            </connections>
-        </placeholder>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="12" userLabel="Portrait View">
-            <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-            <subviews>
-                <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" tag="1" contentMode="scaleToFill" bounces="NO" showsHorizontalScrollIndicator="NO" id="98" userLabel="contentView" customClass="TPKeyboardAvoidingScrollView">
-                    <rect key="frame" x="0.0" y="0.0" width="768" height="966"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                </scrollView>
-                <view tag="2" contentMode="scaleToFill" id="14" userLabel="tabBar">
-                    <rect key="frame" x="0.0" y="947" width="768" height="77"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                    <subviews>
-                        <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="18" userLabel="cancelButton">
-                            <rect key="frame" x="0.0" y="0.0" width="384" height="77"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Cancel"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                            <state key="normal" title="Cancel" backgroundImage="setup_cancel_default.png">
-                                <color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="disabled" backgroundImage="setup_cancel_disabled.png"/>
-                            <state key="highlighted" backgroundImage="setup_cancel_over.png">
-                                <color key="titleColor" red="0.72549019609999998" green="0.76862745099999996" blue="0.79607843140000001" alpha="1" colorSpace="deviceRGB"/>
-                            </state>
-                            <connections>
-                                <action selector="onDialerBackClick:" destination="-1" eventType="touchUpInside" id="pz2-rx-iMl"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="16" userLabel="startButton">
-                            <rect key="frame" x="384" y="0.0" width="384" height="77"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Start"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <inset key="titleEdgeInsets" minX="54" minY="18" maxX="0.0" maxY="0.0"/>
-                            <state key="normal" title="Start" backgroundImage="setup_start_default.png">
-                                <color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" backgroundImage="setup_start_over.png">
-                                <color key="titleColor" red="0.72549019609999998" green="0.76862745099999996" blue="0.79607843140000001" alpha="1" colorSpace="deviceRGB"/>
-                            </state>
-                            <connections>
-                                <action selector="onStartClick:" destination="-1" eventType="touchUpInside" id="25"/>
-                            </connections>
-                        </button>
-                        <button hidden="YES" opaque="NO" tag="5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="17" userLabel="backButton">
-                            <rect key="frame" x="384" y="0.0" width="384" height="77"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Back"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <inset key="titleEdgeInsets" minX="54" minY="18" maxX="0.0" maxY="0.0"/>
-                            <state key="normal" title="Back" backgroundImage="setup_back_default.png">
-                                <color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="disabled" backgroundImage="setup_back_disabled.png"/>
-                            <state key="highlighted" backgroundImage="setup_back_over.png">
-                                <color key="titleColor" red="0.72549019609999998" green="0.76862745099999996" blue="0.79607843140000001" alpha="1" colorSpace="deviceRGB"/>
-                            </state>
-                            <connections>
-                                <action selector="onBackClick:" destination="-1" eventType="touchUpInside" id="23"/>
-                            </connections>
-                        </button>
-                    </subviews>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                </view>
-                <view hidden="YES" tag="6" contentMode="scaleToFill" id="129" userLabel="waitView">
-                    <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                    <subviews>
-                        <activityIndicatorView opaque="NO" tag="7" contentMode="scaleToFill" animating="YES" style="whiteLarge" id="130" userLabel="activityIndicatorView">
-                            <rect key="frame" x="366" y="492" width="37" height="37"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                        </activityIndicatorView>
-                    </subviews>
-                    <color key="backgroundColor" white="1" alpha="0.5" colorSpace="calibratedWhite"/>
-                </view>
-            </subviews>
-            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-            <nil key="simulatedStatusBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-        </view>
-        <view contentMode="scaleToFill" id="118" userLabel="Landscape View">
-            <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-            <subviews>
-                <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" tag="1" contentMode="scaleToFill" bounces="NO" showsHorizontalScrollIndicator="NO" id="119" userLabel="contentView" customClass="TPKeyboardAvoidingScrollView">
-                    <rect key="frame" x="0.0" y="0.0" width="1024" height="711"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                </scrollView>
-                <view tag="2" contentMode="scaleToFill" id="120" userLabel="tabBar">
-                    <rect key="frame" x="0.0" y="691" width="1024" height="77"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                    <subviews>
-                        <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="122" userLabel="cancelButton">
-                            <rect key="frame" x="0.0" y="0.0" width="512" height="77"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Cancel"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <inset key="titleEdgeInsets" minX="0.0" minY="18" maxX="0.0" maxY="0.0"/>
-                            <state key="normal" title="Cancel" backgroundImage="setup_cancel_default_landscape.png">
-                                <color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="disabled" backgroundImage="setup_cancel_disabled_landscape.png"/>
-                            <state key="highlighted" backgroundImage="setup_cancel_over_landscape.png">
-                                <color key="titleColor" red="0.72549019609999998" green="0.76862745099999996" blue="0.79607843140000001" alpha="1" colorSpace="deviceRGB"/>
-                            </state>
-                            <connections>
-                                <action selector="onDialerBackClick:" destination="-1" eventType="touchUpInside" id="s23-r4-4Vg"/>
-                            </connections>
-                        </button>
-                        <button opaque="NO" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="123" userLabel="startButton">
-                            <rect key="frame" x="512" y="0.0" width="512" height="77"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Start"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <inset key="titleEdgeInsets" minX="16" minY="18" maxX="0.0" maxY="0.0"/>
-                            <state key="normal" title="Start" backgroundImage="setup_start_default_landscape.png">
-                                <color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="highlighted" backgroundImage="setup_start_over_landscape.png">
-                                <color key="titleColor" red="0.72549019609999998" green="0.76862745099999996" blue="0.79607843140000001" alpha="1" colorSpace="deviceRGB"/>
-                            </state>
-                            <connections>
-                                <action selector="onStartClick:" destination="-1" eventType="touchUpInside" id="126"/>
-                            </connections>
-                        </button>
-                        <button hidden="YES" opaque="NO" tag="5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="124" userLabel="backButton">
-                            <rect key="frame" x="512" y="0.0" width="512" height="77"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxY="YES"/>
-                            <accessibility key="accessibilityConfiguration" label="Back"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <inset key="titleEdgeInsets" minX="16" minY="18" maxX="0.0" maxY="0.0"/>
-                            <state key="normal" title="Back" backgroundImage="setup_back_default_landscape.png">
-                                <color key="titleColor" red="0.35686274509999999" green="0.39607843139999999" blue="0.43529411759999997" alpha="1" colorSpace="deviceRGB"/>
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <state key="disabled" backgroundImage="setup_back_disabled_landscape.png"/>
-                            <state key="highlighted" backgroundImage="setup_back_over_landscape.png">
-                                <color key="titleColor" red="0.72549019609999998" green="0.76862745099999996" blue="0.79607843140000001" alpha="1" colorSpace="deviceRGB"/>
-                            </state>
-                            <connections>
-                                <action selector="onBackClick:" destination="-1" eventType="touchUpInside" id="127"/>
-                            </connections>
-                        </button>
-                    </subviews>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                </view>
-                <view hidden="YES" tag="6" contentMode="scaleToFill" id="132" userLabel="waitView">
-                    <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                    <subviews>
-                        <activityIndicatorView opaque="NO" tag="7" contentMode="scaleToFill" animating="YES" style="whiteLarge" id="133" userLabel="activityIndicatorView">
-                            <rect key="frame" x="494" y="364" width="37" height="37"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                        </activityIndicatorView>
-                    </subviews>
-                    <color key="backgroundColor" white="1" alpha="0.5" colorSpace="calibratedWhite"/>
-                </view>
-            </subviews>
-            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-            <nil key="simulatedStatusBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-        </view>
-    </objects>
-    <resources>
-        <image name="setup_back_default.png" width="320" height="154"/>
-        <image name="setup_back_default_landscape.png" width="1024" height="171"/>
-        <image name="setup_back_disabled.png" width="320" height="154"/>
-        <image name="setup_back_disabled_landscape.png" width="1024" height="171"/>
-        <image name="setup_back_over.png" width="320" height="154"/>
-        <image name="setup_back_over_landscape.png" width="1024" height="171"/>
-        <image name="setup_cancel_default.png" width="320" height="154"/>
-        <image name="setup_cancel_default_landscape.png" width="1024" height="171"/>
-        <image name="setup_cancel_disabled.png" width="320" height="154"/>
-        <image name="setup_cancel_disabled_landscape.png" width="1024" height="171"/>
-        <image name="setup_cancel_over.png" width="320" height="154"/>
-        <image name="setup_cancel_over_landscape.png" width="1024" height="171"/>
-        <image name="setup_start_default.png" width="320" height="154"/>
-        <image name="setup_start_default_landscape.png" width="1024" height="171"/>
-        <image name="setup_start_over.png" width="320" height="154"/>
-        <image name="setup_start_over_landscape.png" width="1024" height="171"/>
-    </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
-</document>
diff --git a/Classes/FirstLoginViewController.h b/Classes/FirstLoginViewController.h
deleted file mode 100644
index 47894df39..000000000
--- a/Classes/FirstLoginViewController.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* FirstLoginViewController.h
- *
- * Copyright (C) 2011  Belledonne Comunications, Grenoble, France
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or   
- *  (at your option) any later version.                                 
- *                                                                      
- *  This program is distributed in the hope that it will be useful,     
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of      
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the       
- *  GNU General Public License for more details.                
- *                                                                      
- *  You should have received a copy of the GNU General Public License   
- *  along with this program; if not, write to the Free Software         
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */              
-
-#import <UIKit/UIKit.h>
-
-#import "UICompositeViewController.h"
-
-@interface FirstLoginViewController : UIViewController<UITextFieldDelegate, UICompositeViewDelegate> {
-}
-
-- (IBAction)onLoginClick:(id)sender;
-- (IBAction)onSiteClick:(id)sender;
-
-@property (nonatomic, strong) IBOutlet UIButton* loginButton;
-@property (nonatomic, strong) IBOutlet UIButton* siteButton;
-@property (nonatomic, strong) IBOutlet UITextField* usernameField;
-@property (nonatomic, strong) IBOutlet UITextField* passwordField;
-@property (nonatomic, strong) IBOutlet UIView* waitView;
-
-@end
diff --git a/Classes/FirstLoginViewController.m b/Classes/FirstLoginViewController.m
deleted file mode 100644
index ab4d97759..000000000
--- a/Classes/FirstLoginViewController.m
+++ /dev/null
@@ -1,192 +0,0 @@
-/* FirstLoginViewController.m
- *
- * Copyright (C) 2011  Belledonne Comunications, Grenoble, France
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#import "LinphoneManager.h"
-#import "FirstLoginViewController.h"
-#import "LinphoneManager.h"
-#import "PhoneMainView.h"
-
-@implementation FirstLoginViewController
-
-@synthesize loginButton;
-@synthesize siteButton;
-@synthesize usernameField;
-@synthesize passwordField;
-@synthesize waitView;
-
-#pragma mark - Lifecycle Functions
-
-- (id)init {
-	return [super initWithNibName:@"FirstLoginViewController" bundle:[NSBundle mainBundle]];
-}
-
-- (void)dealloc {
-
-	// Remove all observer
-	[[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
-#pragma mark - UICompositeViewDelegate Functions
-
-static UICompositeViewDescription *compositeDescription = nil;
-
-+ (UICompositeViewDescription *)compositeViewDescription {
-	if (compositeDescription == nil) {
-		compositeDescription = [[UICompositeViewDescription alloc] init:@"FirstLogin"
-																content:@"FirstLoginViewController"
-															   stateBar:@"UIStateBar"
-																 tabBar:nil
-															 fullscreen:false
-														  landscapeMode:false
-														   portraitMode:true];
-	}
-	return compositeDescription;
-}
-
-#pragma mark - ViewController Functions
-
-- (void)viewWillAppear:(BOOL)animated {
-	[super viewWillAppear:animated];
-	// Set observer
-	[[NSNotificationCenter defaultCenter] addObserver:self
-											 selector:@selector(registrationUpdateEvent:)
-												 name:kLinphoneRegistrationUpdate
-											   object:nil];
-
-	[usernameField setText:[[LinphoneManager instance] lpConfigStringForKey:@"wizard_username"]];
-	[passwordField setText:[[LinphoneManager instance] lpConfigStringForKey:@"wizard_password"]];
-
-	// Update on show
-	const MSList *list = linphone_core_get_proxy_config_list([LinphoneManager getLc]);
-	if (list != NULL) {
-		LinphoneProxyConfig *config = (LinphoneProxyConfig *)list->data;
-		if (config) {
-			[self registrationUpdate:linphone_proxy_config_get_state(config)];
-		}
-	}
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
-	[super viewWillDisappear:animated];
-
-	// Remove observer
-	[[NSNotificationCenter defaultCenter] removeObserver:self name:kLinphoneRegistrationUpdate object:nil];
-}
-
-- (void)viewDidLoad {
-	[super viewDidLoad];
-
-	NSString *siteUrl = [[LinphoneManager instance] lpConfigStringForKey:@"first_login_view_url"];
-	if (siteUrl == nil) {
-		siteUrl = @"http://www.linphone.org";
-	}
-	[siteButton setTitle:siteUrl forState:UIControlStateNormal];
-}
-
-#pragma mark - Event Functions
-
-- (void)registrationUpdateEvent:(NSNotification *)notif {
-	[self registrationUpdate:[[notif.userInfo objectForKey:@"state"] intValue]];
-}
-
-#pragma mark -
-
-- (void)registrationUpdate:(LinphoneRegistrationState)state {
-	switch (state) {
-	case LinphoneRegistrationOk: {
-		[[LinphoneManager instance] lpConfigSetBool:FALSE forKey:@"enable_first_login_view_preference"];
-		[waitView setHidden:true];
-		[[PhoneMainView instance] changeCurrentView:[DialerViewController compositeViewDescription]];
-		break;
-	}
-	case LinphoneRegistrationNone:
-	case LinphoneRegistrationCleared: {
-		[waitView setHidden:true];
-		break;
-	}
-	case LinphoneRegistrationFailed: {
-		[waitView setHidden:true];
-
-		// erase uername passwd
-		[[LinphoneManager instance] lpConfigSetString:nil forKey:@"wizard_username"];
-		[[LinphoneManager instance] lpConfigSetString:nil forKey:@"wizard_password"];
-		break;
-	}
-	case LinphoneRegistrationProgress: {
-		[waitView setHidden:false];
-		break;
-	}
-	default:
-		break;
-	}
-}
-
-#pragma mark - Action Functions
-
-- (void)onSiteClick:(id)sender {
-	NSURL *url = [NSURL URLWithString:siteButton.titleLabel.text];
-	[[UIApplication sharedApplication] openURL:url];
-	return;
-}
-
-- (void)onLoginClick:(id)sender {
-	NSString *errorMessage = nil;
-	if ([usernameField.text length] == 0) {
-		errorMessage = NSLocalizedString(@"Enter your username", nil);
-	} else if ([passwordField.text length] == 0) {
-		errorMessage = NSLocalizedString(@"Enter your password", nil);
-	}
-
-	if (errorMessage != nil) {
-		UIAlertView *error = nil;
-		error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Alert", nil)
-										   message:errorMessage
-										  delegate:nil
-								 cancelButtonTitle:NSLocalizedString(@"Continue", nil)
-								 otherButtonTitles:nil];
-		[error show];
-	} else {
-		linphone_core_clear_all_auth_info([LinphoneManager getLc]);
-		linphone_core_clear_proxy_config([LinphoneManager getLc]);
-		LinphoneProxyConfig *proxyCfg = linphone_core_create_proxy_config([LinphoneManager getLc]);
-		/*default domain is supposed to be preset from linphonerc*/
-		NSString *identity =
-			[NSString stringWithFormat:@"sip:%@@%s", usernameField.text, linphone_proxy_config_get_addr(proxyCfg)];
-		linphone_proxy_config_set_identity(proxyCfg, [identity UTF8String]);
-		LinphoneAuthInfo *auth_info = linphone_auth_info_new(
-			[usernameField.text UTF8String], [usernameField.text UTF8String], [passwordField.text UTF8String], NULL,
-			NULL, linphone_proxy_config_get_domain(proxyCfg));
-		linphone_core_add_auth_info([LinphoneManager getLc], auth_info);
-		linphone_core_add_proxy_config([LinphoneManager getLc], proxyCfg);
-		linphone_core_set_default_proxy_config([LinphoneManager getLc], proxyCfg);
-		// reload address book to prepend proxy config domain to contacts' phone number
-		[[[LinphoneManager instance] fastAddressBook] reload];
-		[self.waitView setHidden:false];
-	};
-}
-
-#pragma mark - UITextFieldDelegate Functions
-
-- (BOOL)textFieldShouldReturn:(UITextField *)theTextField {
-	// When the user presses return, take focus away from the text field so that the keyboard is dismissed.
-	[theTextField resignFirstResponder];
-	return YES;
-}
-
-@end
diff --git a/Classes/LaunchScreen.xib b/Classes/LaunchScreen.xib
index 1be441a93..8b16ac5e4 100644
--- a/Classes/LaunchScreen.xib
+++ b/Classes/LaunchScreen.xib
@@ -13,7 +13,7 @@
             <subviews>
                 <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="splashscreen.png" id="pz0-nR-x0f" userLabel="logo">
                     <rect key="frame" x="95" y="249" width="185" height="169"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                 </imageView>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
diff --git a/Classes/LinphoneUI/Base.lproj/UIMainBar.xib b/Classes/LinphoneUI/Base.lproj/UIMainBar.xib
index 766863b97..12cac23ce 100644
--- a/Classes/LinphoneUI/Base.lproj/UIMainBar.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIMainBar.xib
@@ -25,11 +25,15 @@
             <rect key="frame" x="0.0" y="0.0" width="360" height="63"/>
             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
             <subviews>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_C.png" id="svE-vh-ct2" userLabel="backgroundImage">
+                    <rect key="frame" x="0.0" y="0.0" width="360" height="63"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                </imageView>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="6" userLabel="historyButton" customClass="UIIconButton">
                     <rect key="frame" x="0.0" y="0.0" width="90" height="63"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <accessibility key="accessibilityConfiguration" label="History"/>
-                    <state key="normal" image="footer_history.png" backgroundImage="color_C.png"/>
+                    <state key="normal" image="footer_history.png"/>
                     <state key="highlighted" backgroundImage="color_A.png"/>
                     <connections>
                         <action selector="onHistoryClick:" destination="-1" eventType="touchUpInside" id="22"/>
@@ -53,7 +57,7 @@
                     <rect key="frame" x="180" y="0.0" width="90" height="63"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <accessibility key="accessibilityConfiguration" label="Dialer"/>
-                    <state key="normal" image="footer_dialer.png" backgroundImage="color_C.png"/>
+                    <state key="normal" image="footer_dialer.png"/>
                     <state key="highlighted" backgroundImage="color_A.png"/>
                     <connections>
                         <action selector="onDialerClick:" destination="-1" eventType="touchUpInside" id="24"/>
@@ -118,7 +122,6 @@
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </view>
             </subviews>
-            <color key="backgroundColor" red="0.2666666667" green="0.2666666667" blue="0.2666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <nil key="simulatedStatusBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <point key="canvasLocation" x="209" y="259.5"/>
diff --git a/Classes/LinphoneUI/Base.lproj/UIStateBar.xib b/Classes/LinphoneUI/Base.lproj/UIStateBar.xib
index 8fc156145..a70efa05c 100644
--- a/Classes/LinphoneUI/Base.lproj/UIStateBar.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIStateBar.xib
@@ -22,6 +22,10 @@
             <rect key="frame" x="0.0" y="0.0" width="360" height="42"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_A.png" id="mcm-kl-NzJ" userLabel="backgroundView">
+                    <rect key="frame" x="0.0" y="0.0" width="360" height="42"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                </imageView>
                 <view hidden="YES" contentMode="scaleToFill" id="0Vp-VF-wmX" userLabel="incallView">
                     <rect key="frame" x="0.0" y="0.0" width="360" height="42"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -85,7 +89,6 @@
                     </state>
                 </button>
             </subviews>
-            <color key="backgroundColor" red="1" green="0.36862745099999999" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <nil key="simulatedStatusBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <point key="canvasLocation" x="148" y="122"/>
@@ -93,6 +96,7 @@
     </objects>
     <resources>
         <image name="call_quality_indicator_4.png" width="20" height="20"/>
+        <image name="color_A.png" width="1" height="1"/>
         <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/MainStoryboard.storyboard b/Classes/MainStoryboard.storyboard
index dc493538e..bf35d75a5 100644
--- a/Classes/MainStoryboard.storyboard
+++ b/Classes/MainStoryboard.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13E28" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="eUP-Pz-8te">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="eUP-Pz-8te">
     <dependencies>
-        <deployment defaultVersion="1536" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
     </dependencies>
     <scenes>
         <!--Phone Main View-->
@@ -13,11 +13,11 @@
                         <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" image="background.png" id="aXd-fi-pw6" userLabel="background">
+                            <view tag="1" contentMode="scaleToFill" id="rUw-rG-KgP" userLabel="background">
                                 <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <color key="backgroundColor" cocoaTouchSystemColor="darkTextColor"/>
-                            </imageView>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            </view>
                             <view contentMode="scaleToFill" id="rlH-Ra-JOu" userLabel="statusBarBG">
                                 <rect key="frame" x="0.0" y="0.0" width="768" height="20"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
@@ -40,9 +40,6 @@
             <point key="canvasLocation" x="342" y="73"/>
         </scene>
     </scenes>
-    <resources>
-        <image name="background.png" width="640" height="523"/>
-    </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>
diff --git a/Classes/PhoneMainView.h b/Classes/PhoneMainView.h
index ea3787fe8..545f1bd30 100644
--- a/Classes/PhoneMainView.h
+++ b/Classes/PhoneMainView.h
@@ -25,7 +25,6 @@
 
 /* These imports are here so that we can import PhoneMainView.h without bothering to import all the rest of the view headers */
 #import "AboutViewController.h"
-#import "FirstLoginViewController.h"
 #import "IncomingCallViewController.h"
 #import "ChatRoomViewController.h"
 #import "ChatViewController.h"
@@ -38,7 +37,6 @@
 #import "HistoryDetailsViewController.h"
 #import "InCallViewController.h"
 #import "SettingsViewController.h"
-#import "FirstLoginViewController.h"
 #import "WizardViewController.h"
 #import "IncomingCallViewController.h"
 #import "ImageViewController.h"
diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index 49b73ad5e..67da5f67f 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -417,8 +417,7 @@ static RootViewManager *rootViewManagerInstance = nil;
 		if (linphone_core_get_global_state(core) != LinphoneGlobalOn) {
 			[self changeCurrentView:[DialerViewController compositeViewDescription]];
 		} else if ([[LinphoneManager instance] lpConfigBoolForKey:@"enable_first_login_view_preference"] == true) {
-			// Change to fist login view
-			[self changeCurrentView:[FirstLoginViewController compositeViewDescription]];
+			// TODO: Change to fist login view
 		} else {
 			// always start to dialer when testing
 			// Change to default view
diff --git a/Classes/SideMenuViewController.xib b/Classes/SideMenuViewController.xib
index 3e557ac1d..ad863af43 100644
--- a/Classes/SideMenuViewController.xib
+++ b/Classes/SideMenuViewController.xib
@@ -33,6 +33,10 @@
                             <rect key="frame" x="0.0" y="0.0" width="300" height="100"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="color_F.png" id="90B-Re-hmt" userLabel="backgroundColor">
+                                    <rect key="frame" x="0.0" y="0.0" width="300" height="100"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                </imageView>
                                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="avatar.png" id="BNQ-7N-NGT" userLabel="avatarImage">
                                     <rect key="frame" x="0.0" y="15" width="90" height="61"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -52,7 +56,6 @@
                                     <nil key="highlightedColor"/>
                                 </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"/>
@@ -94,6 +97,7 @@
     </objects>
     <resources>
         <image name="avatar.png" width="261" height="261"/>
+        <image name="color_F.png" width="1" height="1"/>
     </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
diff --git a/Classes/ar.lproj/DialerViewController~ipad.strings b/Classes/ar.lproj/DialerViewController~ipad.strings
deleted file mode 100644
index aaf670cba80d323ffea4558e06ea414e3094c651..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4658
zcmc(jZEq4m5Xa}$zTi__+BE2;wjM1|VtfJgsu&YZs2|{ZV60L~0Hc0+^*_6e+w@$H
zso9zh9PHEVZ)SFO_I~|r&@rWy(2!<S&<Z7?m-y__2O7~OP3b$W>4L8DYeo~)zd&n2
zCCb$Hzosj+&hS~&4|<EXE8AD*$!U(3DJ|`|x&5ACrsZb5oADh+eMU`*z9TwEFSm-$
zMq-L}Ht@ScM>|R1`!hq+9GfF^ZW8L53-j7E@!d2mwSn>w`i0dM^M9gSs})D*R(zLt
z43_s5;sm2u8w)#rj(HO3=que=%`HL5MX#5?uWP#|5|TCULpKR!W?*tWo6y)R=qWXQ
z<JVKCu>mO7D7WCzd&(Fi3utCL`PrsjJmO645viRaE{phW$gg|%D0*rNCm}Ay^BP-Z
zBt66$T%+BgZjQJlW9&8dtwk+ScF!^yWon{*J4ak1@t}~0Wz?#WwA3U{N?a1z(P5I4
z3dxC@#7T)u(%q~xOmbQwIaQN5DRD_;onex8g`}+}aZ=)v$U4I$603a-(`Ok@N?a1z
z1z{5LKTpzC+r&wUOCpgeOd>JCljzTRCnYY4oEBjciPN4$f7UxGaY-(5Iu^*=R`d}W
zDd(p{{GXw0&&OJo9Dr-IIY4TjA^&`1^K{NVb2CKt$<L=d<?8>IdG1Oo))rf~9*`Sw
zPTjU_tk<|U9l(MmeW|se>_^X~&lK2NnK^_NdyinTK5mc`_-MJKk4o(Hg!&BPz;s}@
zK0Gp^$MsL4<(n1nOTJ(6U5RhYb-Pnea!;<$IPQ`kz|JFR;1Ksi)&$%AfB5vu+J1pp
zRi^>T0K5kDnM!WsQ~Vt}rf>F5N{Rc5^X?lPjf)z}E+UcBgHUpfJ_<j<+Y%pzIR@wW
JpW*4)e*@Tit0Vvb

diff --git a/Classes/ar.lproj/FirstLoginViewController.strings b/Classes/ar.lproj/FirstLoginViewController.strings
deleted file mode 100644
index 2b995e5f4dee39143a9e9155c454d05d287c374c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1306
zcmcIk%L>9U5S&vE{fZ)pSVWOZ5yXpCQ4sW?AK(igq*b({{=7PgwSo_{J_sS3Y_iGh
z?BsYbkb?yiE+qO`vzaKfC(uI^U5v3qfI4QhBt~2>(c8z6ZLIgtFrZhm2iT)U-$3uZ
z##wW|f=`b}>l~rYU31QcJk>-sy44B&7T;yic94DRwnP*mDQr;_CQ_ox(H54-iX1I<
zufg^S-lfitLOjJn=RqO*9m2=)|BEROhaGaDYGX_EtEdW|aag?Juo#;|S96yRS+qs|
zkL-Pq?G<~Up{Za)Z3N7?ALcU-V=bPWP?MLl&$x0>xM54J#MPYAT0{5DTTI<!^L1r;
ZtTV}9NBt#|YP%@xTQrZOU-fnW{u7S!zybgO

diff --git a/Classes/ar.lproj/IncomingCallViewController~ipad.strings b/Classes/ar.lproj/IncomingCallViewController~ipad.strings
deleted file mode 100644
index f211f997448564400575c77ec9e0e3ece63457af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3150
zcmdT_O;5r=5PhdP@GBZFC^14sN{I2mSA@jGlimv<1_RY-{rdCj+sc->i0w!<n$1FY
zc01iS@6F8XO9?ep;h~2)Lfmn9IOZ(l93ymbkC@{c5iLiwhnR3olan)yG2?qPo_NM7
z_r~0rrylxTO_KeHPw(%a@yu0XkLkako(-1!Ro<t>=K%Y;zEw^=_|lO;%vVYrKZmNb
zjKB?1e~qc-U}~u`b!A6}($9rz6@NWby@cU7iFnM2MtoXia@Kb6wbl44(vX38*pn04
z<$r}(D^isvf4_%1=B=N|j8$<RKI%B&Y;YcOHZxfJ43+h|QrjlKS=t*ht|2aY%M0es
z6pzc>X!6QsE5rkR8uo58u=#M&8H+a4n$)D9@Kqdd8vG;bb3(-~7{Q3K^tcLHXXY8`
z8`Q#kZrCbgEL!wNnFHx13LT`X9dhkUjq5xW$jw!&FRR+35nBH%{T6{@yY7&`jt0!z
zkGvU+mN!i;-42<q@7a1}H5sr%X|d(+eXjC;BkuyZozPgc7>iJ>i{9qNwt2S+q4i&E
t-nl3=9J;+DV&%;4^ub!+Fcv+7f3MqbLblG_|Lpj!wVr1zTITX~{5KdLz|jBz

diff --git a/Classes/ar.lproj/WizardViewController~ipad.strings b/Classes/ar.lproj/WizardViewController~ipad.strings
deleted file mode 100644
index 2dfe14ce3efb3b3929389b0776442edb6895cdc4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2482
zcmd6o!AiqG5QhKL9P$*kAeADPrlqZlm$nBBf`{q@q@{=G8lmdJmskHplOoxYOviu>
z31N12cmDa9$>&Fa9=d2@28ReQv=*-Tv~iCGrg+0E?HLI@m-I(i(>7UTj1^+;iy85b
z8?LRm;))ZN^hen8{k`{=>ko`r)3d<5i0fnY6VYWh0l!nvS*^R;#VH+`%Zc>lNYdK^
znoe0lm0LXVR)@PxlVh%VHLP0vr~h5{8ZOhUvX7Ni#w9A_gQ)c7RIcT`5iT|@b*R{~
z*KnDUOOkb$t7J1Nv6-mZ9J6CCq|;Ex*ws|gvF6_tn-F1%PU_Q6G^;*;{ql*X;j>?n
z|Bl^Uvue;Vsz0Mc3_OGeYC`|zpR-?26(6et4WGKRI>gXJXLt}D+w}HVFYh3`9{>5f
K?n&wVR`3N{17wi^

diff --git a/Classes/fr.lproj/DialerViewController~ipad.strings b/Classes/fr.lproj/DialerViewController~ipad.strings
deleted file mode 100644
index 87fdedcf57aabeaeb0bab7092b68f923cc6bd3f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4762
zcmchb+iuf95QhKjJcZR8q+URs9@47fB29}_2?<2X1GtV01viP3R2<%rH-VP`{@KaY
zQH<+M(MFb|WbNIVZ)SFOCVzf+@B+I?FhGe6b6yEv^4`IFT;d7^zG8t_xaGGJBaWZ)
zX@;Cv5#GPWHJ_He7x;$Pe0Ck)wRJ8q=92=mFmD__M_g&PoUbds;jB*_$@%Uj&iR&V
zakP}UOFcXMeuU>6N#A)`LFJ3I?;N|QHbqT`B1q{_!c(j<4Ym_|e8ePJNokc}m48UK
zw>9YrXNh&DVZQ1&rlxnnk~0#^<+szn_3~OKfoVOVPHMq~RuuhyQSS-IM!}{F{w{e}
z9F^v6wmsu|3tkhh?2oY_XJ*vpaT^^kpIa;)yJP7`&`_d%vxxaWDvSN5y>YU}bK>Sv
z32}Y1*W#5F_J;XIM!dUR*N96p<o=W>o3;|AYo1Awx{1!2QGYVSZX?nxlA0ndMYl%O
zbrY$SxIVHy-b}JzBiVP8sFb)Qz1Ao@sF57FNmNQ)64SHUCx<nXLpO;^iA!R7Hj`M+
zu5y{bVo@n^No*H1lUV#!Bt5rJR7zYD%S_EAmJ=!x|H-dX;*!{@(M)1_x+3wP`6?wY
z$rVq@jFsFRH$1<jwjJ<y$?Ne7ty`-FWW-wwtV)*(RW&H_j5<ttNhc$E#I?bu#O8JL
zY4-`WLjQqFSmU#u(ULhnw|dj|X2s^O8s5=g(ihxsg{;qBX2f{SH;h-yqZOgQn&`9h
z6+Y{drAL(>dwa2J)M97ZtI~x@M<v~O+m5x<y|RG63R$;6Mr()<*7b<HV=b!Z!TXXY
z+SsigsM!5=%LQ}fO|bQL_U;g0!hbb6yBUr1yO1HX7TO;3lG?*)WyG7C2cd@=<3o^X
M{~X9}Th*e2zjd9{a{vGU

diff --git a/Classes/fr.lproj/FirstLoginViewController.strings b/Classes/fr.lproj/FirstLoginViewController.strings
deleted file mode 100644
index a47022a9833e8ab9a132dcf38bfcaa2c8358515f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1366
zcmchX-Acni5QWcmo+9){=!M=$D2O*ILZSYE`T%VWwX%&R*`mI@`pqUyp|-R!D$9o5
z%<h~yb7uDQBhrz&ighlhp$bN<Q)WjG>g!&q-sE+uDJ!Q({-0nSYRpK(`Kd-&9n<Sw
z18k#kcIBsFpDV*MV^w;%;nXv`F}M1<s8N&3-X*Sxb)v()&^on;YrTLI6YGH%crRls
z@Z!N+5Q#+)F@C~)9`a<|pTMz<7`NZ!y4nAKv1_91Eg7|Xc_j~dT^ZYS?XBtBYpm-P
zI6ml_@|{=cWj+0kn(Z0xQnL-GvryfhtYlSgo2WP7-h|#*-rc5KqT@B?>`&94yrUOW
puyVeJTA-w@_v^*)OtVmPGit!`M%l~b@V4y2w%j&*U-jTFHeb{o({ca+

diff --git a/Classes/fr.lproj/IncomingCallViewController~ipad.strings b/Classes/fr.lproj/IncomingCallViewController~ipad.strings
deleted file mode 100644
index 4ed88b14550353a76135ac745eedcaa9f43840ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3158
zcmdT_O;5r=5Pj$ViiRTx1<?{>JRn?1j3y>}FNg+1D}nm;=hZh`7I15A2ddFD8_Mi<
zcHX=<Gw*L6_ECqA9;OJf;N#<jtA;BKaEeDHd>#<fa!h-O5udR+Il&MUemCKXSDbNg
z$eroRL!bXfW<Taz`uzpZ+#7pB|NYh3V7XssJRaWz?3KE!w(@XEueXeM!QZ*@=F!v7
zq3bR)F(dl#v9%p+Z8f&dyUL<l^Py+1XBbZm0|_%6^DQdmu;bwDsBxb2-iY_zkVl{S
z72Vk=1Vs^}F6M+WztDr#bOTK^aKP2#I^;Sk;O;9-*6Uh(d47xH9T07ZJ4SiUDjMT?
z8I7jOT&_Yq(WhiBtpXo;HP?iTPAuBG>u%gv9dnut45$*(O2iz-%%&(OWZ#(<aND99
z(%P_HM=W~$Gt9`H^u4js>zucXZmUpi)!4Gy?K1l9<KJyUZ1%O3i9D?atk%z5iAB#<
zI=!T4m+hmwA=J%4+l{Oq1NJ8^M*SRgyXJ4yUI2G0ibaccH|@H(ZEe_Tv2E?;VYB|%
ubEDe$HN3e~BWBMkp723tVu(e{+TWY<dAPES{m)6?&P+P7Xn89;=|2EtUfA&f

diff --git a/Classes/fr.lproj/WizardViewController~ipad.strings b/Classes/fr.lproj/WizardViewController~ipad.strings
deleted file mode 100644
index ba55f02459d029eec4a0c7c7ea15922d7d2d51a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2522
zcmd6o!D_-l5QhJAo+9MvK`}}dqz9uHK@e>F05Nz-yGBUsp^w~`u>G@b;vp-WVK-2g
zgfKfhv;Ta%lkaPQ5e5jcf<lUSju4N0BD`RO1Q&d8oKeuSpgl##anznU4#>GKr^hF@
zoI7wvH4&a@Pf_yyyLQL<S9)Z$Y_M+p#(4Pi7;rZMzbnhIQ?96qvc?xqI$y~grH&Xd
znoM6ot)-5m@T`?7MyqS$s>mGOw+0ELL|6IEN@&(1G!qlrvy#<Wy7WZHO^c0<`|c%N
zR^(FXo2IO6<}EgJF`Ff`6(m!g_I~b;yCNGQ9~$~%6eDg?s%+9O=R>2pj&+ZdaJsL`
zoa5H%eCUv{>fX6yObnzZVp9L>e{^4!jg%i95>{RNc#Nrm)KpB$y|bHZSl=jjJ?8kg
I+tgO@1MKN~<p2Nx

diff --git a/Classes/ru.lproj/DialerViewController~ipad.strings b/Classes/ru.lproj/DialerViewController~ipad.strings
deleted file mode 100644
index ad8ebdf51aa37566950b4d158b9366ca8762fff6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4728
zcmchbTW`}a6vxklpZbW9ctQ(%+ygXOvve)1)^uDZRb15Z0kX7+LDyAn5%A?V{>SdY
zXdz2n<jBgFI<b#`=jP+w-L~ij9Z*0cno~w=w17@<?b9bZrwf|VPukFHy29O@rs(hE
zX+}BPOuv6cmv}nIwV_`$#<NTPuFUg_7I-qFl^(ayf2WvfwH<F}e2-CI(Uardb2`IY
zW)(+Ui3eC`3-?F#yq5I+KQla1k&0DEbybT00kv^|io2m=$t|>9G_chAVjX;;8?6~b
zXjc6<^8`E}3e*8cu|}49`~vd?(9?Ii*4kTvlAF73{=Kd`+6YKi+EsmM3l>lV^%9yo
z#Xak;kLwJ5C#tRN`l>XTf@*_y13q`}nP6lFO+BoM?)JHON!Qs+p1?~!ssz3<P;XQZ
zgmt{*|JcO0%Y6U%9@Vikm671rLhTCMgd}f>b-2ehip?B;NhXLz_O)dtQFzZXA%)IF
z0ix+Gd@gOs+r*p7ye*`tKovPt87Y44B+*_@a#$cabS5!U{E{S<p4KUlbeu_y6u%_0
z&T^Z?1(MjA#7OZ=BI_(Ck-Tm5nR``Yr1&L~C@3cp|Fa~CvrUW?za)~G%1I<ASQ7Ud
zz)0~+B0EPpiR5WZ;=b=2DSk;Vuv2EJ>DKfa)hpMsBmADDJzT3rg?fN{T<d{7U6;nX
zwjW{-<$5*2FRo4p*irpgZ*^(K;$qKehgx9|OhU)!m~jJqDXf{(w@PbDY+63|s^KZ>
z?F3h+0j?p=o>O>hUejA8i&{SSTH-P67lJR+r_gcZzADUo3gbBCvlySN__SRWt+KOQ
ze)kHb$lueEnnEW%__P0L6>nZ^yDyQks<@>Nu-xwT$}_O>`8jSVW+(JRe}~C&k})2B
nt#fl$L7N~a8GQ&X_w1UJd-ziD4yS07sRH8DwE2!O+FJTI+Uc{9

diff --git a/Classes/ru.lproj/FirstLoginViewController.strings b/Classes/ru.lproj/FirstLoginViewController.strings
deleted file mode 100644
index e0acddc53b4752521dc9275eb8065b729a155d61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1306
zcmcgsO>4qH5PgR^<>;w5gGUc-5gQ}g53Ce~Ks@LV@C&u9Y0;F{Kd*heO(LX9-CE1C
z?8nT`?wdDnw;KmnD8t1g6b4waxwvI7p^pxFnBW63o-pT3Va)votpkkMCdPk`A+3r%
z#u@=_L*u)Pv*LP*h?WIsUlBrjJ##hUsSeuNtzKd;^IZ<-9xji%t&~N$kfwy<;$H5g
zA%WC5R^(b*a>I2f`hJJ)H@II-mNfDiUQ9kTvcE&RKmPw<v*EN$PIRrjGYiYCDh_e#
z=Q#DPIW3aEhlJ1b@pn3^pZK%I(ZU<`5i`qCl0zGo0-l>vm+9F<{CKG57}7hox+{>M
lI#uQ$rLgbFB2!BXR+i$wqkj`cou%4370dqUJ7wix{|Qxnz#ISo

diff --git a/Classes/ru.lproj/IncomingCallViewController~ipad.strings b/Classes/ru.lproj/IncomingCallViewController~ipad.strings
deleted file mode 100644
index d4d54bd2283fa41242effa1f280a03cc0f3bede2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3166
zcmdUxOHaZ;6ot=XR;-LGSK6>-p}cGbgdmSa6B1UsFN7EjRHOCv=hZWXLY#{2mHNtL
z$n?&1I^Uf8;PoYkBNSkviy1uJu~}%c=Wz}f9o!>eyM|9ogLV&Nwn?~hiV>!KZ^{+V
z7;tXHnb~TG9-qeHywB0%{UO&}h4z5^_f~7|<$QtX$#HDsFx9v6s~z@LN7YqBwNz7`
za6C}@i#fLMBRpH)#tm=ab3Vu5bHscHs!gt@8m4AjD<apf8)_be8U(y!pQCxAiZz3>
zCZ^m|rzEsc4|VLQA~n^&X|yzX1D^MZ%0wPrL<vQd*(>Z-_TvQAKH`aXU3=c9eUp68
z<&Ao{<S8#0LlZnMPa}yjQzs7(+*9jzo4{6rNvAE+sM}Fxs-qQZXQY~h-lboT>8W$x
zpU<1L_~bF;%o5lu^n^uBMEOQrr0lz@PcN;~UtLCKEykaP&t^>+_uechwyP8Av#8Ce
zeXpCgNOhBE((U+Ubuh|Fk!RY>Qc}XN)j~6W{zN3&Fe{_BNO|Kv>@Y9se*!JmkKc^L
wO?+wMa9ak6er6r<nMafBy&bC|+9Fl&Z`J%wOmW5jXWe&VwNG25nx(1xZ(ISyYXATM

diff --git a/Classes/ru.lproj/WizardViewController~ipad.strings b/Classes/ru.lproj/WizardViewController~ipad.strings
deleted file mode 100644
index 03cffaec0e9280a37fc82408861b506faf8dd930..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2506
zcmd6o!D@p*5QhK5o_vRvkYf&MYit!#FQ!leLJvtFz=Rx3wg%Gn(3fxfYpW@^K_{zF
zh839|cjupv8NWUqTw#O(X3$9RN*f^L8sZsqM0m#=ZI6teDg6o7v`rD2Vuh67rHuGM
z%)J$Nbaldl{sad;f4+U<{+1DIdggej;%;#F8!=)w4&QUnxYb?5>XZw0tsc1|6|4L{
zhbGgOQRe|KyjNpcsM5@~tcR@{^XXmYFJTiE)!j9c@oQxKv&i@)<MqPDPDvXoHn~ff
z%*Z4wx=S~532IydF_%mB%DuW(p$dBI8hcGmgt}4D7bh2Pja2TFPPcAUnrm53I0>uM
zy3BVR=Ug{RB)r;BZWj{+t%;b{|M?f4R@B7FUW0^D+bQnCGZ6C5B4jhy&DASA$zF~5
M{9_m8bpGc54Sv{Y9RL6T

diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index e65ba0b0a..ef77008cb 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -17,7 +17,6 @@
 		2214EB7A12F846B1002A5394 /* UICallButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EB7912F846B1002A5394 /* UICallButton.m */; };
 		2214EB8912F84EBB002A5394 /* UIHangUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EB8812F84EBB002A5394 /* UIHangUpButton.m */; };
 		2214EBF312F86360002A5394 /* UIMicroButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EBF212F86360002A5394 /* UIMicroButton.m */; };
-		2218A92512FBE1340088A667 /* FirstLoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2218A92312FBE1340088A667 /* FirstLoginViewController.m */; };
 		22276E8713C73D8A00210156 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8613C73D8A00210156 /* CoreVideo.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		22276E8913C73DC000210156 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8813C73DC000210156 /* CoreMedia.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		22405EEE1600B4E400B92522 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22405EED1600B4E400B92522 /* AssetsLibrary.framework */; };
@@ -375,8 +374,6 @@
 		D38187B915FE342200C3EDCA /* ContactDetailsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187BC15FE342200C3EDCA /* ContactDetailsViewController.xib */; };
 		D38187BD15FE342800C3EDCA /* ContactsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187C015FE342800C3EDCA /* ContactsViewController.xib */; };
 		D38187C115FE345B00C3EDCA /* DialerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187C415FE345B00C3EDCA /* DialerViewController.xib */; };
-		D38187C515FE345F00C3EDCA /* DialerViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187C815FE345F00C3EDCA /* DialerViewController~ipad.xib */; };
-		D38187C915FE346400C3EDCA /* FirstLoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187CC15FE346400C3EDCA /* FirstLoginViewController.xib */; };
 		D38187CD15FE346700C3EDCA /* HistoryDetailsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187D015FE346700C3EDCA /* HistoryDetailsViewController.xib */; };
 		D38187D115FE346B00C3EDCA /* HistoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187D415FE346B00C3EDCA /* HistoryViewController.xib */; };
 		D38187D915FE347700C3EDCA /* IncomingCallViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187DC15FE347700C3EDCA /* IncomingCallViewController.xib */; };
@@ -389,8 +386,6 @@
 		D3A8BB7015A6C7D500F96BE5 /* UIChatRoomCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A8BB6F15A6C7D500F96BE5 /* UIChatRoomCell.m */; };
 		D3C6526715AC1A8F0092A874 /* UIEditableTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3C6526615AC1A8F0092A874 /* UIEditableTableViewCell.m */; };
 		D3D5126C160B3A8E00946DF8 /* WizardViews.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3D5126A160B3A8E00946DF8 /* WizardViews.xib */; };
-		D3D51270160B3AD400946DF8 /* WizardViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3D5126E160B3AD400946DF8 /* WizardViewController~ipad.xib */; };
-		D3D52A731614480700DEB00A /* IncomingCallViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3D52A711614480700DEB00A /* IncomingCallViewController~ipad.xib */; };
 		D3EA53FD159850E80037DC6B /* LinphoneManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D3EA53FC159850E80037DC6B /* LinphoneManager.m */; };
 		D3EA540D1598528B0037DC6B /* ChatTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3EA540C1598528B0037DC6B /* ChatTableViewController.m */; };
 		D3EA5411159853750037DC6B /* UIChatCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3EA5410159853750037DC6B /* UIChatCell.m */; };
@@ -570,8 +565,6 @@
 		2214EB8812F84EBB002A5394 /* UIHangUpButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIHangUpButton.m; sourceTree = "<group>"; };
 		2214EBF112F86360002A5394 /* UIMicroButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIMicroButton.h; sourceTree = "<group>"; };
 		2214EBF212F86360002A5394 /* UIMicroButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIMicroButton.m; sourceTree = "<group>"; };
-		2218A92212FBE1340088A667 /* FirstLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FirstLoginViewController.h; sourceTree = "<group>"; };
-		2218A92312FBE1340088A667 /* FirstLoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = FirstLoginViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		22276E8013C73D3100210156 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = "liblinphone-sdk/apple-darwin/lib/libavcodec.a"; sourceTree = "<group>"; };
 		22276E8113C73D3100210156 /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = "liblinphone-sdk/apple-darwin/lib/libavutil.a"; sourceTree = "<group>"; };
 		22276E8213C73D3100210156 /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = "liblinphone-sdk/apple-darwin/lib/libswscale.a"; sourceTree = "<group>"; };
@@ -1071,19 +1064,15 @@
 		F095481B1883F15300E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/ContactDetailsViewController.xib; sourceTree = "<group>"; };
 		F095481C1883F15300E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/ContactsViewController.xib; sourceTree = "<group>"; };
 		F095481D1883F15300E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DialerViewController.xib; sourceTree = "<group>"; };
-		F095481E1883F15300E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = "Base.lproj/DialerViewController~ipad.xib"; sourceTree = "<group>"; };
-		F095481F1883F15300E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/FirstLoginViewController.xib; sourceTree = "<group>"; };
 		F09548201883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/HistoryDetailsViewController.xib; sourceTree = "<group>"; };
 		F09548211883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/HistoryViewController.xib; sourceTree = "<group>"; };
 		F09548221883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/ImageViewController.xib; sourceTree = "<group>"; };
 		F09548231883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/InCallViewController.xib; sourceTree = "<group>"; };
 		F09548241883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/IncomingCallViewController.xib; sourceTree = "<group>"; };
-		F09548251883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = "Base.lproj/IncomingCallViewController~ipad.xib"; sourceTree = "<group>"; };
 		F09548281883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UICallCell.xib; sourceTree = "<group>"; };
 		F09548291883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIConferenceHeader.xib; sourceTree = "<group>"; };
 		F095482C1883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIMainBar.xib; sourceTree = "<group>"; };
 		F095482E1883F15500E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/WizardViewController.xib; sourceTree = "<group>"; };
-		F095482F1883F15500E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = "Base.lproj/WizardViewController~ipad.xib"; sourceTree = "<group>"; };
 		F09548301883F15500E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/WizardViews.xib; sourceTree = "<group>"; };
 		F09548311883F1EB00E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/ChatRoomViewController.strings; sourceTree = "<group>"; };
 		F09548321883F20A00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/ChatRoomViewController.strings; sourceTree = "<group>"; };
@@ -1097,10 +1086,6 @@
 		F095483A1883F2CA00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/ContactsViewController.strings; sourceTree = "<group>"; };
 		F095483B1883F2DE00E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/DialerViewController.strings; sourceTree = "<group>"; };
 		F095483C1883F2E300E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/DialerViewController.strings; sourceTree = "<group>"; };
-		F095483D1883F49E00E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = "fr.lproj/DialerViewController~ipad.strings"; sourceTree = "<group>"; };
-		F095483E1883F4A200E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = "ru.lproj/DialerViewController~ipad.strings"; sourceTree = "<group>"; };
-		F095483F1883F4B700E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/FirstLoginViewController.strings; sourceTree = "<group>"; };
-		F09548401883F4BC00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/FirstLoginViewController.strings; sourceTree = "<group>"; };
 		F09548411883F51600E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/HistoryViewController.strings; sourceTree = "<group>"; };
 		F09548421883F51B00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/HistoryViewController.strings; sourceTree = "<group>"; };
 		F09548431883F52600E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/ImageViewController.strings; sourceTree = "<group>"; };
@@ -1109,16 +1094,12 @@
 		F09548461883F54200E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InCallViewController.strings; sourceTree = "<group>"; };
 		F09548471883F55300E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/IncomingCallViewController.strings; sourceTree = "<group>"; };
 		F09548481883F55800E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/IncomingCallViewController.strings; sourceTree = "<group>"; };
-		F09548491883F56A00E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = "fr.lproj/IncomingCallViewController~ipad.strings"; sourceTree = "<group>"; };
-		F095484A1883F56E00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = "ru.lproj/IncomingCallViewController~ipad.strings"; sourceTree = "<group>"; };
 		F095484F1883F5D500E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/UIConferenceHeader.strings; sourceTree = "<group>"; };
 		F09548501883F5D900E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/UIConferenceHeader.strings; sourceTree = "<group>"; };
 		F09548551883F61300E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/UIMainBar.strings; sourceTree = "<group>"; };
 		F09548561883F61600E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/UIMainBar.strings; sourceTree = "<group>"; };
 		F09548591883F67800E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/WizardViewController.strings; sourceTree = "<group>"; };
 		F095485A1883F67B00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/WizardViewController.strings; sourceTree = "<group>"; };
-		F095485B1883F68500E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = "fr.lproj/WizardViewController~ipad.strings"; sourceTree = "<group>"; };
-		F095485C1883F68800E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = "ru.lproj/WizardViewController~ipad.strings"; sourceTree = "<group>"; };
 		F095485D1883F6E700E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/WizardViews.strings; sourceTree = "<group>"; };
 		F095485E1883F6EA00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/WizardViews.strings; sourceTree = "<group>"; };
 		F0AF06F01A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/AboutViewController.strings; sourceTree = "<group>"; };
@@ -1128,14 +1109,11 @@
 		F0AF06F41A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/ContactDetailsViewController.strings; sourceTree = "<group>"; };
 		F0AF06F51A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/ContactsViewController.strings; sourceTree = "<group>"; };
 		F0AF06F61A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/DialerViewController.strings; sourceTree = "<group>"; };
-		F0AF06F71A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = "ar.lproj/DialerViewController~ipad.strings"; sourceTree = "<group>"; };
-		F0AF06F81A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/FirstLoginViewController.strings; sourceTree = "<group>"; };
 		F0AF06F91A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/HistoryDetailsViewController.strings; sourceTree = "<group>"; };
 		F0AF06FA1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/HistoryViewController.strings; sourceTree = "<group>"; };
 		F0AF06FB1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/ImageViewController.strings; sourceTree = "<group>"; };
 		F0AF06FC1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/InCallViewController.strings; sourceTree = "<group>"; };
 		F0AF06FD1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/IncomingCallViewController.strings; sourceTree = "<group>"; };
-		F0AF06FE1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = "ar.lproj/IncomingCallViewController~ipad.strings"; sourceTree = "<group>"; };
 		F0AF07011A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/UICallCell.strings; sourceTree = "<group>"; };
 		F0AF07021A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/UIChatCell.strings; sourceTree = "<group>"; };
 		F0AF07031A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/UIChatRoomCell.strings; sourceTree = "<group>"; };
@@ -1148,7 +1126,6 @@
 		F0AF070D1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/PhoneMainView.strings; sourceTree = "<group>"; };
 		F0AF070E1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/SettingsViewController.strings; sourceTree = "<group>"; };
 		F0AF070F1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/WizardViewController.strings; sourceTree = "<group>"; };
-		F0AF07101A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = "ar.lproj/WizardViewController~ipad.strings"; sourceTree = "<group>"; };
 		F0AF07111A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/WizardViews.strings; sourceTree = "<group>"; };
 		F0B026F21AA710AF00FF49F7 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
 		F0B89C2118DC89E30050B60E /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
@@ -1332,10 +1309,6 @@
 				22F2508B107141E100AC9B3F /* DialerViewController.h */,
 				22F2508C107141E100AC9B3F /* DialerViewController.m */,
 				D38187C415FE345B00C3EDCA /* DialerViewController.xib */,
-				D38187C815FE345F00C3EDCA /* DialerViewController~ipad.xib */,
-				2218A92212FBE1340088A667 /* FirstLoginViewController.h */,
-				2218A92312FBE1340088A667 /* FirstLoginViewController.m */,
-				D38187CC15FE346400C3EDCA /* FirstLoginViewController.xib */,
 				635775231B6673EC00C8B704 /* HistoryDetailsTableViewController.h */,
 				635775241B6673EC00C8B704 /* HistoryDetailsTableViewController.m */,
 				C90FAA7615AF54E6002091CB /* HistoryDetailsViewController.h */,
@@ -1361,7 +1334,6 @@
 				D3F26BEE15986B71005F9CAB /* IncomingCallViewController.h */,
 				D3F26BEF15986B71005F9CAB /* IncomingCallViewController.m */,
 				D38187DC15FE347700C3EDCA /* IncomingCallViewController.xib */,
-				D3D52A711614480700DEB00A /* IncomingCallViewController~ipad.xib */,
 				F0C1F8EA1A277ADA009402C9 /* LaunchScreen.xib */,
 				1D3623240D0F684500981E51 /* LinphoneAppDelegate.h */,
 				1D3623250D0F684500981E51 /* LinphoneAppDelegate.m */,
@@ -1380,19 +1352,18 @@
 				D35E759C159460B50066B1C1 /* SettingsViewController.h */,
 				D35E759D159460B50066B1C1 /* SettingsViewController.m */,
 				636316D61A1DEC650009B839 /* SettingsViewController.xib */,
+				633756371B67BAF400E21BAD /* SideMenuTableViewController.h */,
+				633756381B67BAF400E21BAD /* SideMenuTableViewController.m */,
+				633756421B67D2B100E21BAD /* SideMenuViewController.h */,
+				633756431B67D2B100E21BAD /* SideMenuViewController.m */,
+				633756441B67D2B100E21BAD /* SideMenuViewController.xib */,
 				D326483415887D4400930C67 /* Utils */,
 				34216F3E1547EBCD00EA9777 /* VideoZoomHandler.h */,
 				34216F3F1547EBCD00EA9777 /* VideoZoomHandler.m */,
 				D350F20B15A43BB100149E54 /* WizardViewController.h */,
 				D350F20C15A43BB100149E54 /* WizardViewController.m */,
 				D38187E015FE348A00C3EDCA /* WizardViewController.xib */,
-				D3D5126E160B3AD400946DF8 /* WizardViewController~ipad.xib */,
 				D3D5126A160B3A8E00946DF8 /* WizardViews.xib */,
-				633756371B67BAF400E21BAD /* SideMenuTableViewController.h */,
-				633756381B67BAF400E21BAD /* SideMenuTableViewController.m */,
-				633756421B67D2B100E21BAD /* SideMenuViewController.h */,
-				633756431B67D2B100E21BAD /* SideMenuViewController.m */,
-				633756441B67D2B100E21BAD /* SideMenuViewController.xib */,
 			);
 			path = Classes;
 			sourceTree = "<group>";
@@ -2286,7 +2257,6 @@
 				634CEDF11B6630DB00D7A921 /* options_default.png in Resources */,
 				634CEE141B6630DB00D7A921 /* status_disconnected_desktop.png in Resources */,
 				634CEDD41B6630DB00D7A921 /* history_all_selected.png in Resources */,
-				D38187C915FE346400C3EDCA /* FirstLoginViewController.xib in Resources */,
 				63AADBFE1B6A0FF200AA16FD /* shortring.caf in Resources */,
 				634CEE051B6630DB00D7A921 /* security_pending.png in Resources */,
 				636316D91A1DECC90009B839 /* PhoneMainView.xib in Resources */,
@@ -2408,7 +2378,6 @@
 				F0642EF119DAC891009DB336 /* MainStoryboard.storyboard in Resources */,
 				634CEDBC1B6630DB00D7A921 /* chat_start_body_over.png in Resources */,
 				63AADC021B6A0FF200AA16FD /* wizard_remote.rc in Resources */,
-				D38187C515FE345F00C3EDCA /* DialerViewController~ipad.xib in Resources */,
 				634CEE121B6630DB00D7A921 /* status_busy_phone.png in Resources */,
 				634CEDFB1B6630DB00D7A921 /* quit_default.png in Resources */,
 				63158FAD1B468E0E00969917 /* ImageOptim.sh in Resources */,
@@ -2448,7 +2417,6 @@
 				634CEDB31B6630DB00D7A921 /* chat_message_delivered.png in Resources */,
 				63AADBED1B6A0FF200AA16FD /* corner-left-top.png in Resources */,
 				634CEE131B6630DB00D7A921 /* status_disconnected.png in Resources */,
-				D3D51270160B3AD400946DF8 /* WizardViewController~ipad.xib in Resources */,
 				634CEDB71B6630DB00D7A921 /* chat_picture_over.png in Resources */,
 				634CEDF91B6630DB00D7A921 /* pause_small_disabled.png in Resources */,
 				F0C1F8EB1A277ADA009402C9 /* LaunchScreen.xib in Resources */,
@@ -2471,7 +2439,6 @@
 				634CEDD71B6630DB00D7A921 /* history_missed_selected.png in Resources */,
 				634CED9C1B6630DB00D7A921 /* call_audio_start.png in Resources */,
 				634CEDCD1B6630DB00D7A921 /* edit.png in Resources */,
-				D3D52A731614480700DEB00A /* IncomingCallViewController~ipad.xib in Resources */,
 				F0938159188E629800A55DFA /* iTunesArtwork in Resources */,
 				634CEDC11B6630DB00D7A921 /* conference_start.png in Resources */,
 				634CEDAD1B6630DB00D7A921 /* camera_selected.png in Resources */,
@@ -2591,7 +2558,6 @@
 				630CF5571AF7CE1500539F7A /* UITextField+DoneButton.m in Sources */,
 				2214EBF312F86360002A5394 /* UIMicroButton.m in Sources */,
 				22968A5F12F875C600588287 /* UISpeakerButton.m in Sources */,
-				2218A92512FBE1340088A667 /* FirstLoginViewController.m in Sources */,
 				22C755601317E59C007BC101 /* UIBluetoothButton.m in Sources */,
 				22AA8B0113D83F6300B30535 /* UICamSwitch.m in Sources */,
 				636BC9971B5F921B00C754CE /* UIIconButton.m in Sources */,
@@ -2962,28 +2928,6 @@
 			name = DialerViewController.xib;
 			sourceTree = "<group>";
 		};
-		D38187C815FE345F00C3EDCA /* DialerViewController~ipad.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				F095481E1883F15300E8A69B /* Base */,
-				F095483D1883F49E00E8A69B /* fr */,
-				F095483E1883F4A200E8A69B /* ru */,
-				F0AF06F71A24BA760086C9C1 /* ar */,
-			);
-			name = "DialerViewController~ipad.xib";
-			sourceTree = "<group>";
-		};
-		D38187CC15FE346400C3EDCA /* FirstLoginViewController.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				F095481F1883F15300E8A69B /* Base */,
-				F095483F1883F4B700E8A69B /* fr */,
-				F09548401883F4BC00E8A69B /* ru */,
-				F0AF06F81A24BA760086C9C1 /* ar */,
-			);
-			name = FirstLoginViewController.xib;
-			sourceTree = "<group>";
-		};
 		D38187D015FE346700C3EDCA /* HistoryDetailsViewController.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -3083,28 +3027,6 @@
 			name = WizardViews.xib;
 			sourceTree = "<group>";
 		};
-		D3D5126E160B3AD400946DF8 /* WizardViewController~ipad.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				F095482F1883F15500E8A69B /* Base */,
-				F095485B1883F68500E8A69B /* fr */,
-				F095485C1883F68800E8A69B /* ru */,
-				F0AF07101A24BA770086C9C1 /* ar */,
-			);
-			name = "WizardViewController~ipad.xib";
-			sourceTree = "<group>";
-		};
-		D3D52A711614480700DEB00A /* IncomingCallViewController~ipad.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				F09548251883F15400E8A69B /* Base */,
-				F09548491883F56A00E8A69B /* fr */,
-				F095484A1883F56E00E8A69B /* ru */,
-				F0AF06FE1A24BA770086C9C1 /* ar */,
-			);
-			name = "IncomingCallViewController~ipad.xib";
-			sourceTree = "<group>";
-		};
 		F088488D19FF8C41007FFCF3 /* UIContactCell.xib */ = {
 			isa = PBXVariantGroup;
 			children = (