diff --git a/Classes/Base.lproj/InCallViewController.xib b/Classes/Base.lproj/InCallViewController.xib
index 4764ea0cb..b6ac414c9 100644
--- a/Classes/Base.lproj/InCallViewController.xib
+++ b/Classes/Base.lproj/InCallViewController.xib
@@ -61,7 +61,7 @@
                     </connections>
                 </tableView>
                 <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" adjustsImageWhenDisabled="NO" lineBreakMode="middleTruncation" id="160" userLabel="videoCameraSwitch" customClass="UICamSwitch">
-                    <rect key="frame" x="20" y="40" width="85" height="33"/>
+                    <rect key="frame" x="0.0" y="35" width="85" height="33"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <accessibility key="accessibilityConfiguration" label="Switch camera"/>
                     <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
diff --git a/Classes/InCallViewController.m b/Classes/InCallViewController.m
index e23e914ed..cd1760b67 100644
--- a/Classes/InCallViewController.m
+++ b/Classes/InCallViewController.m
@@ -278,7 +278,7 @@ static UICompositeViewDescription *compositeDescription = nil;
         case LinphoneCallEnd:
         case LinphoneCallError:
         {
-            if(linphone_core_get_calls_nb(lc) <= 2) {
+            if(linphone_core_get_calls_nb(lc) <= 2 && !videoShown) {
                 [callTableController maximizeAll];
             }
             break;
@@ -301,6 +301,7 @@ static UICompositeViewDescription *compositeDescription = nil;
         [UIView setAnimationDuration:0.3];
         [[PhoneMainView instance] showTabBar: true];
         [[PhoneMainView instance] showStateBar: true];
+        [callTableView setAlpha:1.0];
         [videoCameraSwitch setAlpha:1.0];
         [UIView commitAnimations];
         
@@ -323,6 +324,7 @@ static UICompositeViewDescription *compositeDescription = nil;
         [UIView beginAnimations:nil context:nil];
         [UIView setAnimationDuration:0.3];
         [videoCameraSwitch setAlpha:0.0];
+        [callTableView setAlpha:0.0];
         [UIView commitAnimations];
         
         
@@ -360,6 +362,11 @@ static UICompositeViewDescription *compositeDescription = nil;
     [videoGroup setAlpha:1.0];
     [callTableView setAlpha:0.0];
     
+    UIEdgeInsets insets = {33, 0, 25, 0};
+    [callTableView setContentInset:insets];
+    [callTableView setScrollIndicatorInsets:insets];
+    [callTableController minimizeAll];
+
     if(animation) {
         [UIView commitAnimations];
     }
@@ -407,6 +414,15 @@ static UICompositeViewDescription *compositeDescription = nil;
     
     [videoGroup setAlpha:0.0];
     [[PhoneMainView instance] showTabBar: true];
+
+    UIEdgeInsets insets = {10, 0, 25, 0};
+    [callTableView setContentInset:insets];
+    [callTableView setScrollIndicatorInsets:insets];
+    [callTableView setAlpha:1.0];
+    if(linphone_core_get_calls_nb([LinphoneManager getLc]) <= 2) {
+        [callTableController maximizeAll];
+    }
+
     [callTableView setAlpha:1.0];
     [videoCameraSwitch setHidden:TRUE];
     
diff --git a/Classes/LinphoneUI/Base.lproj/UICallCell.xib b/Classes/LinphoneUI/Base.lproj/UICallCell.xib
index ce8ef8149..26a96e2fb 100644
--- a/Classes/LinphoneUI/Base.lproj/UICallCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UICallCell.xib
@@ -332,13 +332,13 @@
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                         </imageView>
                         <label autoresizesSubviews="NO" opaque="NO" userInteractionEnabled="NO" contentMode="left" text="0102030405" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="17" userLabel="addressLabel">
-                            <rect key="frame" x="10" y="0.0" width="206" height="51"/>
+                            <rect key="frame" x="95" y="0.0" width="125" height="51"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="Contact's name">
                                 <accessibilityTraits key="traits" none="YES"/>
                             </accessibility>
                             <fontDescription key="fontDescription" type="system" pointSize="30"/>
-                            <color key="textColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" id="18" userLabel="stateImage">
diff --git a/Classes/LinphoneUI/fr.lproj/UICallCell.xib b/Classes/LinphoneUI/fr.lproj/UICallCell.xib
index f46e17fa6..687ecd959 100644
--- a/Classes/LinphoneUI/fr.lproj/UICallCell.xib
+++ b/Classes/LinphoneUI/fr.lproj/UICallCell.xib
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5023" systemVersion="13B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
-        <deployment defaultVersion="1536" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UICallCell">
@@ -332,13 +331,13 @@
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                         </imageView>
                         <label autoresizesSubviews="NO" opaque="NO" userInteractionEnabled="NO" contentMode="left" text="0102030405" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="17" userLabel="addressLabel">
-                            <rect key="frame" x="10" y="0.0" width="206" height="51"/>
+                            <rect key="frame" x="95" y="0.0" width="125" height="51"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="Nom du contact">
                                 <accessibilityTraits key="traits" none="YES"/>
                             </accessibility>
                             <fontDescription key="fontDescription" type="system" pointSize="30"/>
-                            <color key="textColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" id="18" userLabel="stateImage">
@@ -423,4 +422,4 @@
         <image name="call_state_play_over.png" width="43" height="46"/>
         <image name="cell_call_first.png" width="640" height="125"/>
     </resources>
-</document>
\ No newline at end of file
+</document>
diff --git a/Classes/LinphoneUI/ru.lproj/UICallCell.xib b/Classes/LinphoneUI/ru.lproj/UICallCell.xib
index 17c58a21e..0254060a6 100644
--- a/Classes/LinphoneUI/ru.lproj/UICallCell.xib
+++ b/Classes/LinphoneUI/ru.lproj/UICallCell.xib
@@ -332,13 +332,13 @@
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                         </imageView>
                         <label autoresizesSubviews="NO" opaque="NO" userInteractionEnabled="NO" contentMode="left" text="0102030405" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="17" userLabel="addressLabel">
-                            <rect key="frame" x="10" y="0.0" width="206" height="51"/>
+                            <rect key="frame" x="95" y="0.0" width="125" height="51"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             <accessibility key="accessibilityConfiguration" label="Имя контакта">
                                 <accessibilityTraits key="traits" none="YES"/>
                             </accessibility>
                             <fontDescription key="fontDescription" type="system" pointSize="30"/>
-                            <color key="textColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" id="18" userLabel="stateImage">