diff --git a/Classes/LinphoneUI/UICallCell.m b/Classes/LinphoneUI/UICallCell.m
index d84003213..69e4e9ee6 100644
--- a/Classes/LinphoneUI/UICallCell.m
+++ b/Classes/LinphoneUI/UICallCell.m
@@ -62,8 +62,8 @@
                 UIImage *tmpImage = [FastAddressBook getContactImage:contact thumbnail:false];
                 if(tmpImage != nil) {
                     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, (unsigned long)NULL), ^(void) {
-                        [tmpImage forceDecompression];
-                        self.image = tmpImage;
+                        UIImage *tmpImage2 = [UIImage decodedImageWithImage:tmpImage];
+                        self.image = tmpImage2;
                     });
                 }
             }
@@ -261,7 +261,7 @@
     if (currentCall && ![self isBlinkAnimationRunning:@"blink" target:headerBackgroundHighlightImage]) {
         [self startBlinkAnimation:@"blink" target:headerBackgroundHighlightImage];
     }
-    if (!currentCall && [self isBlinkAnimationRunning:@"blink" target:headerBackgroundHighlightImage]) {
+    if (!currentCall) {
         [self stopBlinkAnimation:@"blink" target:headerBackgroundHighlightImage];
     }
 }
diff --git a/Classes/LinphoneUI/UIChatRoomCell.m b/Classes/LinphoneUI/UIChatRoomCell.m
index 3d7b4b5dd..d23d732ed 100644
--- a/Classes/LinphoneUI/UIChatRoomCell.m
+++ b/Classes/LinphoneUI/UIChatRoomCell.m
@@ -132,7 +132,7 @@ static UIFont *CELL_FONT = nil;
                 UIImage *image = [UIImage imageWithCGImage:[representation fullResolutionImage]
                                                      scale:representation.scale
                                                orientation:(UIImageOrientation)representation.orientation];
-                [image forceDecompression];
+                image = [UIImage decodedImageWithImage:image];
                 if(achat == self->chat) { //Avoid glitch and scrolling
                     dispatch_async(dispatch_get_main_queue(), ^{
                         [messageImageView setImage:image];
diff --git a/Classes/LinphoneUI/UILinphone.h b/Classes/LinphoneUI/UILinphone.h
index 02b6d660c..d291ff639 100644
--- a/Classes/LinphoneUI/UILinphone.h
+++ b/Classes/LinphoneUI/UILinphone.h
@@ -35,8 +35,8 @@
 @end
 
 
-@interface UIImage (NormalizedImage)
+@interface UIImage (ForceDecode)
 
-- (void)forceDecompression;
++ (UIImage *)decodedImageWithImage:(UIImage *)image;
 
 @end
diff --git a/Classes/LinphoneUI/UILinphone.m b/Classes/LinphoneUI/UILinphone.m
index a9fbce149..ab35fe731 100644
--- a/Classes/LinphoneUI/UILinphone.m
+++ b/Classes/LinphoneUI/UILinphone.m
@@ -93,16 +93,36 @@
 
 @end
 
-@implementation UIImage (NormalizedImage)
+@implementation UIImage (ForceDecode)
 
-- (void)forceDecompression {
-    CGImageRef imageRef = [self CGImage];
++ (UIImage *)decodedImageWithImage:(UIImage *)image
+{
+    CGImageRef imageRef = image.CGImage;
     CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-    CGContextRef context = CGBitmapContextCreate(NULL, CGImageGetWidth(imageRef), CGImageGetHeight(imageRef), 8, CGImageGetWidth(imageRef) * 4, colorSpace,kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Little);
+    CGContextRef context = CGBitmapContextCreate(NULL,
+                                                 CGImageGetWidth(imageRef),
+                                                 CGImageGetHeight(imageRef),
+                                                 8,
+                                                 // Just always return width * 4 will be enough
+                                                 CGImageGetWidth(imageRef) * 4,
+                                                 // System only supports RGB, set explicitly
+                                                 colorSpace,
+                                                 // Makes system don't need to do extra conversion when displayed.
+                                                 // NOTE: here we remove the alpha channel for performance. Most of the time, images loaded
+                                                 //       from the network are jpeg with no alpha channel. As a TODO, finding a way to detect
+                                                 //       if alpha channel is necessary would be nice.
+                                                 kCGImageAlphaNoneSkipLast | kCGBitmapByteOrder32Little);
     CGColorSpaceRelease(colorSpace);
-    if (!context) { NSLog(@"Could not create context for image decompression"); return; }
-    CGContextDrawImage(context, (CGRect){{0.0f, 0.0f}, {CGImageGetWidth(imageRef), CGImageGetHeight(imageRef)}}, imageRef);
-    CFRelease(context);
+    if (!context) return nil;
+    
+    CGRect rect = (CGRect){CGPointZero,{CGImageGetWidth(imageRef), CGImageGetHeight(imageRef)}};
+    CGContextDrawImage(context, rect, imageRef);
+    CGImageRef decompressedImageRef = CGBitmapContextCreateImage(context);
+    CGContextRelease(context);
+    
+    UIImage *decompressedImage = [[UIImage alloc] initWithCGImage:decompressedImageRef scale:image.scale orientation:image.imageOrientation];
+    CGImageRelease(decompressedImageRef);
+    return [decompressedImage autorelease];
 }
 
 @end
diff --git a/Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib b/Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib
index a70dc3dc7..34e2154e0 100644
--- a/Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib
+++ b/Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib
@@ -14,6 +14,7 @@
 			<string>IBProxyObject</string>
 			<string>IBUIButton</string>
 			<string>IBUIImageView</string>
+			<string>IBUILabel</string>
 			<string>IBUIView</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
@@ -41,13 +42,14 @@
 						<int key="NSvFlags">290</int>
 						<string key="NSFrameSize">{320, 68}</string>
 						<reference key="NSSuperview" ref="232140160"/>
-						<reference key="NSNextKeyView" ref="735354432"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="35074700"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-							<string key="IBUIAccessibilityLabel">Conference</string>
+							<string key="IBUIAccessibilityLabel"/>
 							<integer value="260" key="IBUIAccessibilityTraits"/>
-							<boolean value="YES" key="IBUIIsAccessibilityElement"/>
+							<boolean value="NO" key="IBUIIsAccessibilityElement"/>
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<object class="NSCustomResource" key="IBUIImage">
@@ -55,21 +57,48 @@
 							<string key="NSResourceName">header_conference.png</string>
 						</object>
 					</object>
-					<object class="IBUIImageView" id="242054672">
+					<object class="IBUILabel" id="35074700">
 						<reference key="NSNextResponder" ref="232140160"/>
-						<int key="NSvFlags">289</int>
-						<string key="NSFrame">{{224, 14}, {25, 25}}</string>
+						<int key="NSvFlags">290</int>
+						<string key="NSFrame">{{10, -3}, {206, 50}}</string>
 						<reference key="NSSuperview" ref="232140160"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="735354432"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<bool key="IBUIClipsSubviews">YES</bool>
+						<int key="IBUIContentMode">7</int>
+						<int key="IBUITag">4</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
+						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+							<string key="IBUIAccessibilityLabel">Conference</string>
+						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<string key="IBUIText">Conference</string>
+						<object class="NSColor" key="IBUITextColor">
+							<int key="NSColorSpace">2</int>
+							<bytes key="NSRGB">MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA</bytes>
+						</object>
+						<nil key="IBUIHighlightedColor"/>
+						<int key="IBUIBaselineAdjustment">0</int>
+						<object class="IBUIFontDescription" key="IBUIFontDescription">
+							<int key="type">2</int>
+							<double key="pointSize">27</double>
+						</object>
+						<object class="NSFont" key="IBUIFont">
+							<string key="NSName">Helvetica-Bold</string>
+							<double key="NSSize">27</double>
+							<int key="NSfFlags">16</int>
+						</object>
+						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 					</object>
 					<object class="IBUIButton" id="735354432">
 						<reference key="NSNextResponder" ref="232140160"/>
 						<int key="NSvFlags">289</int>
 						<string key="NSFrame">{{216, 6}, {41, 41}}</string>
 						<reference key="NSSuperview" ref="232140160"/>
-						<reference key="NSNextKeyView" ref="242054672"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -113,6 +142,7 @@
 				</array>
 				<string key="NSFrameSize">{320, 68}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="1047549470"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -122,7 +152,6 @@
 						<int key="NSID">2</int>
 					</object>
 				</object>
-				<bool key="IBUIAutoresizesSubviews">NO</bool>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 		</array>
@@ -136,14 +165,6 @@
 					</object>
 					<int key="connectionID">5</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">stateImage</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="242054672"/>
-					</object>
-					<int key="connectionID">9</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">pauseButton</string>
@@ -177,8 +198,8 @@
 						<reference key="object" ref="232140160"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="1047549470"/>
-							<reference ref="242054672"/>
 							<reference ref="735354432"/>
+							<reference ref="35074700"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -188,18 +209,18 @@
 						<reference key="parent" ref="232140160"/>
 						<string key="objectName">backgroundImage</string>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">8</int>
-						<reference key="object" ref="242054672"/>
-						<reference key="parent" ref="232140160"/>
-						<string key="objectName">stateImage</string>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">13</int>
 						<reference key="object" ref="735354432"/>
 						<reference key="parent" ref="232140160"/>
 						<string key="objectName">pauseButton</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="35074700"/>
+						<reference key="parent" ref="232140160"/>
+						<string key="objectName">headerLabel</string>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -209,18 +230,59 @@
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="13.CustomClassName">UIPauseButton</string>
 				<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="2" key="13.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<real value="0.0" key="13.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">14</int>
+			<int key="maxID">15</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">UIConferenceHeader</string>
+					<string key="superclassName">UIViewController</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="pauseButton">UIPauseButton</string>
+						<string key="stateImage">UIImageView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="pauseButton">
+							<string key="name">pauseButton</string>
+							<string key="candidateClassName">UIPauseButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="stateImage">
+							<string key="name">stateImage</string>
+							<string key="candidateClassName">UIImageView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIConferenceHeader.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIPauseButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIPauseButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIToggleButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIToggleButton.h</string>
+					</object>
+				</object>
+			</array>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
diff --git a/Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib b/Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib
index 4e2d3e37e..7eefd4d9d 100644
--- a/Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib
+++ b/Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1280</int>
+		<int key="IBDocument.SystemTarget">1536</int>
 		<string key="IBDocument.SystemVersion">11E53</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2840</string>
 		<string key="IBDocument.AppKitVersion">1138.47</string>
 		<string key="IBDocument.HIToolboxVersion">569.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">933</string>
+			<string key="NS.object.0">1926</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBProxyObject</string>
 			<string>IBUIButton</string>
 			<string>IBUIImageView</string>
+			<string>IBUILabel</string>
 			<string>IBUIView</string>
-			<string>IBProxyObject</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -41,13 +42,13 @@
 						<int key="NSvFlags">290</int>
 						<string key="NSFrameSize">{320, 68}</string>
 						<reference key="NSSuperview" ref="232140160"/>
-						<reference key="NSNextKeyView" ref="735354432"/>
+						<reference key="NSNextKeyView" ref="35074700"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-							<string key="IBUIAccessibilityLabel">Conférence</string>
+							<string key="IBUIAccessibilityLabel"/>
 							<integer value="260" key="IBUIAccessibilityTraits"/>
-							<boolean value="YES" key="IBUIIsAccessibilityElement"/>
+							<boolean value="NO" key="IBUIIsAccessibilityElement"/>
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<object class="NSCustomResource" key="IBUIImage">
@@ -55,21 +56,45 @@
 							<string key="NSResourceName">header_conference.png</string>
 						</object>
 					</object>
-					<object class="IBUIImageView" id="242054672">
+					<object class="IBUILabel" id="35074700">
 						<reference key="NSNextResponder" ref="232140160"/>
-						<int key="NSvFlags">289</int>
-						<string key="NSFrame">{{224, 14}, {25, 25}}</string>
+						<int key="NSvFlags">290</int>
+						<string key="NSFrame">{{10, -3}, {206, 50}}</string>
 						<reference key="NSSuperview" ref="232140160"/>
+						<reference key="NSNextKeyView" ref="735354432"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<bool key="IBUIClipsSubviews">YES</bool>
+						<int key="IBUIContentMode">7</int>
+						<int key="IBUITag">4</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
+						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+							<string key="IBUIAccessibilityLabel">Conférence</string>
+						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<string key="IBUIText">Conférence</string>
+						<object class="NSColor" key="IBUITextColor">
+							<int key="NSColorSpace">2</int>
+							<bytes key="NSRGB">MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA</bytes>
+						</object>
+						<nil key="IBUIHighlightedColor"/>
+						<int key="IBUIBaselineAdjustment">0</int>
+						<object class="IBUIFontDescription" key="IBUIFontDescription">
+							<int key="type">2</int>
+							<double key="pointSize">27</double>
+						</object>
+						<object class="NSFont" key="IBUIFont">
+							<string key="NSName">Helvetica-Bold</string>
+							<double key="NSSize">27</double>
+							<int key="NSfFlags">16</int>
+						</object>
+						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 					</object>
 					<object class="IBUIButton" id="735354432">
 						<reference key="NSNextResponder" ref="232140160"/>
 						<int key="NSvFlags">289</int>
 						<string key="NSFrame">{{216, 6}, {41, 41}}</string>
 						<reference key="NSSuperview" ref="232140160"/>
-						<reference key="NSNextKeyView" ref="242054672"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -121,7 +146,6 @@
 						<int key="NSID">2</int>
 					</object>
 				</object>
-				<bool key="IBUIAutoresizesSubviews">NO</bool>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 		</array>
@@ -135,14 +159,6 @@
 					</object>
 					<int key="connectionID">5</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">stateImage</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="242054672"/>
-					</object>
-					<int key="connectionID">9</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">pauseButton</string>
@@ -176,8 +192,8 @@
 						<reference key="object" ref="232140160"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="1047549470"/>
-							<reference ref="242054672"/>
 							<reference ref="735354432"/>
+							<reference ref="35074700"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -187,18 +203,18 @@
 						<reference key="parent" ref="232140160"/>
 						<string key="objectName">backgroundImage</string>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">8</int>
-						<reference key="object" ref="242054672"/>
-						<reference key="parent" ref="232140160"/>
-						<string key="objectName">stateImage</string>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">13</int>
 						<reference key="object" ref="735354432"/>
 						<reference key="parent" ref="232140160"/>
 						<string key="objectName">pauseButton</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="35074700"/>
+						<reference key="parent" ref="232140160"/>
+						<string key="objectName">headerLabel</string>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -208,18 +224,59 @@
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="13.CustomClassName">UIPauseButton</string>
 				<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="2" key="13.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<real value="0.0" key="13.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">14</int>
+			<int key="maxID">15</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">UIConferenceHeader</string>
+					<string key="superclassName">UIViewController</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="pauseButton">UIPauseButton</string>
+						<string key="stateImage">UIImageView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="pauseButton">
+							<string key="name">pauseButton</string>
+							<string key="candidateClassName">UIPauseButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="stateImage">
+							<string key="name">stateImage</string>
+							<string key="candidateClassName">UIImageView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIConferenceHeader.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIPauseButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIPauseButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIToggleButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIToggleButton.h</string>
+					</object>
+				</object>
+			</array>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
@@ -230,6 +287,6 @@
 			<string key="call_state_play_over.png">{43, 46}</string>
 			<string key="header_conference.png">{640, 135}</string>
 		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">933</string>
+		<string key="IBCocoaTouchPluginVersion">1926</string>
 	</data>
 </archive>
diff --git a/Classes/en.lproj/IncomingCallViewController.xib b/Classes/en.lproj/IncomingCallViewController.xib
index 576d66f2e..0fa14357c 100644
--- a/Classes/en.lproj/IncomingCallViewController.xib
+++ b/Classes/en.lproj/IncomingCallViewController.xib
@@ -46,7 +46,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 49}, {320, 63}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1040531505"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">2</int>
@@ -62,7 +61,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{320, 68}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="131610915"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">3</int>
@@ -82,7 +80,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{20, 0}, {280, 50}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="651495339"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -117,7 +114,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{10, 53}, {300, 51}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="632401698"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -4542,7 +4538,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">293</int>
 								<string key="NSFrame">{{0, 96}, {320, 262}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="402572557"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">6</int>
@@ -4558,7 +4553,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">293</int>
 								<string key="NSFrame">{{80, 113}, {160, 170}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="442322210"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">7</int>
@@ -4577,7 +4571,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 						</array>
 						<string key="NSFrameSize">{320, 395}</string>
 						<reference key="NSSuperview" ref="311908381"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1023112121"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="84179139"/>
@@ -4593,7 +4586,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">-2147483374</int>
 								<string key="NSFrame">{{0, 10}, {320, 67}}</string>
 								<reference key="NSSuperview" ref="442322210"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="348909292"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@@ -4612,7 +4604,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">278</int>
 								<string key="NSFrameSize">{160, 77}</string>
 								<reference key="NSSuperview" ref="442322210"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="299451957"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -4650,7 +4641,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">275</int>
 								<string key="NSFrame">{{160, 0}, {160, 77}}</string>
 								<reference key="NSSuperview" ref="442322210"/>
-								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<int key="IBUITag">12</int>
@@ -4675,7 +4665,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 						</array>
 						<string key="NSFrame">{{0, 383}, {320, 77}}</string>
 						<reference key="NSSuperview" ref="311908381"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="908036430"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="84179139"/>
@@ -4685,7 +4674,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="735497316"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="84179139"/>
@@ -4879,68 +4867,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 			<nil key="sourceID"/>
 			<int key="maxID">32</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">IncomingCallViewController</string>
-					<string key="superclassName">TPMultiLayoutViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onAcceptClick:">id</string>
-						<string key="onDeclineClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onAcceptClick:">
-							<string key="name">onAcceptClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onDeclineClick:">
-							<string key="name">onDeclineClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addressLabel">UILabel</string>
-						<string key="avatarImage">UIImageView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addressLabel">
-							<string key="name">addressLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="avatarImage">
-							<string key="name">avatarImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/IncomingCallViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TPMultiLayoutViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="landscapeView">UIView</string>
-						<string key="portraitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="landscapeView">
-							<string key="name">landscapeView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="portraitView">
-							<string key="name">portraitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
diff --git a/Classes/en.lproj/IncomingCallViewController~ipad.xib b/Classes/en.lproj/IncomingCallViewController~ipad.xib
index 2e97c9907..324aade88 100644
--- a/Classes/en.lproj/IncomingCallViewController~ipad.xib
+++ b/Classes/en.lproj/IncomingCallViewController~ipad.xib
@@ -46,7 +46,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, -2000}, {768, 2000}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1023112121"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@@ -61,7 +60,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 49}, {768, 63}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1040531505"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">2</int>
@@ -77,7 +75,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{768, 68}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="131610915"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">3</int>
@@ -97,7 +94,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{20, 0}, {728, 50}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="402572557"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -132,7 +128,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{10, 53}, {748, 51}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="651495339"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -4557,7 +4552,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">293</int>
 								<string key="NSFrame">{{224, 96}, {320, 262}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="632401698"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">6</int>
@@ -4573,7 +4567,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">293</int>
 								<string key="NSFrame">{{304, 113}, {160, 170}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="442322210"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">7</int>
@@ -4592,7 +4585,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 						</array>
 						<string key="NSFrameSize">{768, 958}</string>
 						<reference key="NSSuperview" ref="311908381"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="998666105"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="84179139"/>
@@ -4608,8 +4600,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{-1000, 77}, {2768, 2000}}</string>
 								<reference key="NSSuperview" ref="442322210"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@@ -4623,7 +4613,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">-2147483374</int>
 								<string key="NSFrame">{{0, 10}, {768, 67}}</string>
 								<reference key="NSSuperview" ref="442322210"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="348909292"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@@ -4642,7 +4631,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">278</int>
 								<string key="NSFrameSize">{384, 77}</string>
 								<reference key="NSSuperview" ref="442322210"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="299451957"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -4680,7 +4668,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">275</int>
 								<string key="NSFrame">{{384, 0}, {384, 77}}</string>
 								<reference key="NSSuperview" ref="442322210"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="741669707"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -4706,7 +4693,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 						</array>
 						<string key="NSFrame">{{0, 947}, {768, 77}}</string>
 						<reference key="NSSuperview" ref="311908381"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="908036430"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="84179139"/>
@@ -4716,7 +4702,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 				</array>
 				<string key="NSFrameSize">{768, 1024}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="735497316"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="84179139"/>
@@ -4735,7 +4720,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, -2000}, {1024, 2000}}</string>
 								<reference key="NSSuperview" ref="947839834"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="62199849"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@@ -4750,7 +4734,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 49}, {1024, 63}}</string>
 								<reference key="NSSuperview" ref="947839834"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1071149854"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">2</int>
@@ -4763,7 +4746,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{1024, 68}</string>
 								<reference key="NSSuperview" ref="947839834"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="245587345"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">3</int>
@@ -4780,7 +4762,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{20, 0}, {984, 50}}</string>
 								<reference key="NSSuperview" ref="947839834"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="662162891"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -4808,7 +4789,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{10, 53}, {1004, 51}}</string>
 								<reference key="NSSuperview" ref="947839834"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="364248021"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -4833,7 +4813,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">293</int>
 								<string key="NSFrame">{{352, 96}, {320, 262}}</string>
 								<reference key="NSSuperview" ref="947839834"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="586380894"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">6</int>
@@ -4846,7 +4825,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">293</int>
 								<string key="NSFrame">{{432, 113}, {160, 170}}</string>
 								<reference key="NSSuperview" ref="947839834"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="741290713"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">7</int>
@@ -4862,7 +4840,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 						</array>
 						<string key="NSFrameSize">{1024, 702}</string>
 						<reference key="NSSuperview" ref="174518676"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="455638695"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="84179139"/>
@@ -4878,8 +4855,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{-1000, 86}, {3024, 2000}}</string>
 								<reference key="NSSuperview" ref="741290713"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@@ -4893,7 +4868,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">-2147483374</int>
 								<string key="NSFrame">{{0, 19}, {1024, 67}}</string>
 								<reference key="NSSuperview" ref="741290713"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="634288753"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@@ -4910,7 +4884,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">278</int>
 								<string key="NSFrameSize">{512, 86}</string>
 								<reference key="NSSuperview" ref="741290713"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1015924616"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -4938,7 +4911,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">275</int>
 								<string key="NSFrame">{{512, 0}, {512, 86}}</string>
 								<reference key="NSSuperview" ref="741290713"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="766058250"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -4964,7 +4936,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 						</array>
 						<string key="NSFrame">{{0, 682}, {1024, 86}}</string>
 						<reference key="NSSuperview" ref="174518676"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="794929616"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="84179139"/>
@@ -4974,7 +4945,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 				</array>
 				<string key="NSFrameSize">{1024, 768}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="947839834"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="84179139"/>
@@ -5329,68 +5299,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 			<nil key="sourceID"/>
 			<int key="maxID">80</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">IncomingCallViewController</string>
-					<string key="superclassName">TPMultiLayoutViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onAcceptClick:">id</string>
-						<string key="onDeclineClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onAcceptClick:">
-							<string key="name">onAcceptClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onDeclineClick:">
-							<string key="name">onDeclineClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addressLabel">UILabel</string>
-						<string key="avatarImage">UIImageView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addressLabel">
-							<string key="name">addressLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="avatarImage">
-							<string key="name">avatarImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/IncomingCallViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TPMultiLayoutViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="landscapeView">UIView</string>
-						<string key="portraitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="landscapeView">
-							<string key="name">landscapeView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="portraitView">
-							<string key="name">portraitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
diff --git a/Classes/fr.lproj/IncomingCallViewController.xib b/Classes/fr.lproj/IncomingCallViewController.xib
index 73fb81a6a..17d710cd1 100644
--- a/Classes/fr.lproj/IncomingCallViewController.xib
+++ b/Classes/fr.lproj/IncomingCallViewController.xib
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1280</int>
+		<int key="IBDocument.SystemTarget">1536</int>
 		<string key="IBDocument.SystemVersion">11E53</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2840</string>
 		<string key="IBDocument.AppKitVersion">1138.47</string>
 		<string key="IBDocument.HIToolboxVersion">569.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">933</string>
+			<string key="NS.object.0">1926</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBProxyObject</string>
 			<string>IBUIButton</string>
 			<string>IBUIImageView</string>
-			<string>IBUIView</string>
 			<string>IBUILabel</string>
-			<string>IBProxyObject</string>
+			<string>IBUIView</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -98,7 +98,6 @@
 								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
-								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 								<object class="IBUIFontDescription" key="IBUIFontDescription">
 									<int key="type">2</int>
 									<double key="pointSize">27</double>
@@ -108,6 +107,7 @@
 									<double key="NSSize">27</double>
 									<int key="NSfFlags">16</int>
 								</object>
+								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 							</object>
 							<object class="IBUILabel" id="402572557">
 								<reference key="NSNextResponder" ref="735497316"/>
@@ -4866,68 +4866,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 			<nil key="sourceID"/>
 			<int key="maxID">32</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">IncomingCallViewController</string>
-					<string key="superclassName">TPMultiLayoutViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onAcceptClick:">id</string>
-						<string key="onDeclineClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onAcceptClick:">
-							<string key="name">onAcceptClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onDeclineClick:">
-							<string key="name">onDeclineClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addressLabel">UILabel</string>
-						<string key="avatarImage">UIImageView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addressLabel">
-							<string key="name">addressLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="avatarImage">
-							<string key="name">avatarImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/IncomingCallViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TPMultiLayoutViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="landscapeView">UIView</string>
-						<string key="portraitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="landscapeView">
-							<string key="name">landscapeView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="portraitView">
-							<string key="name">portraitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
@@ -4942,6 +4881,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 			<string key="decline_over.png">{320, 154}</string>
 			<string key="header_incoming.png">{640, 135}</string>
 		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">933</string>
+		<string key="IBCocoaTouchPluginVersion">1926</string>
 	</data>
 </archive>
diff --git a/Classes/fr.lproj/IncomingCallViewController~ipad.xib b/Classes/fr.lproj/IncomingCallViewController~ipad.xib
index e37e238a2..d8c52fb6b 100644
--- a/Classes/fr.lproj/IncomingCallViewController~ipad.xib
+++ b/Classes/fr.lproj/IncomingCallViewController~ipad.xib
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1280</int>
+		<int key="IBDocument.SystemTarget">1536</int>
 		<string key="IBDocument.SystemVersion">11E53</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2840</string>
 		<string key="IBDocument.AppKitVersion">1138.47</string>
 		<string key="IBDocument.HIToolboxVersion">569.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">933</string>
+			<string key="NS.object.0">1926</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBProxyObject</string>
 			<string>IBUIButton</string>
 			<string>IBUIImageView</string>
-			<string>IBUIView</string>
 			<string>IBUILabel</string>
-			<string>IBProxyObject</string>
+			<string>IBUIView</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -112,7 +112,6 @@
 								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
-								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 								<object class="IBUIFontDescription" key="IBUIFontDescription" id="686939356">
 									<int key="type">2</int>
 									<double key="pointSize">27</double>
@@ -122,6 +121,7 @@
 									<double key="NSSize">27</double>
 									<int key="NSfFlags">16</int>
 								</object>
+								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 							</object>
 							<object class="IBUILabel" id="402572557">
 								<reference key="NSNextResponder" ref="735497316"/>
@@ -4779,9 +4779,9 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
-								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 								<reference key="IBUIFontDescription" ref="686939356"/>
 								<reference key="IBUIFont" ref="476575466"/>
+								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 							</object>
 							<object class="IBUILabel" id="662162891">
 								<reference key="NSNextResponder" ref="947839834"/>
@@ -5297,68 +5297,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 			<nil key="sourceID"/>
 			<int key="maxID">80</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">IncomingCallViewController</string>
-					<string key="superclassName">TPMultiLayoutViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onAcceptClick:">id</string>
-						<string key="onDeclineClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onAcceptClick:">
-							<string key="name">onAcceptClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onDeclineClick:">
-							<string key="name">onDeclineClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addressLabel">UILabel</string>
-						<string key="avatarImage">UIImageView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addressLabel">
-							<string key="name">addressLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="avatarImage">
-							<string key="name">avatarImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/IncomingCallViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TPMultiLayoutViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="landscapeView">UIView</string>
-						<string key="portraitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="landscapeView">
-							<string key="name">landscapeView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="portraitView">
-							<string key="name">portraitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
@@ -5377,6 +5316,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 			<string key="decline_over~ipad.png">{768, 153}</string>
 			<string key="header_incoming.png">{640, 135}</string>
 		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">933</string>
+		<string key="IBCocoaTouchPluginVersion">1926</string>
 	</data>
 </archive>
diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist
index 202f78891..f276ab1eb 100644
--- a/linphone.ldb/Contents.plist
+++ b/linphone.ldb/Contents.plist
@@ -3497,17 +3497,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>8</key>
+							<key>9</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>Classes/IncomingCallViewController/8/IncomingCallViewController.xib</string>
+								<string>Classes/IncomingCallViewController/9/IncomingCallViewController.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-27T08:46:32Z</date>
+					<date>2012-10-02T09:37:04Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -3517,7 +3517,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>c9def09966914f8e085b0d06ba3af8a4
+					<string>f0effe06bb21bef9fecdd2569208839f
 </string>
 					<key>name</key>
 					<string>IncomingCallViewController.xib</string>
@@ -3732,9 +3732,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>8</string>
+						<string>9</string>
 						<key>fr</key>
-						<string>8</string>
+						<string>9</string>
 					</dict>
 				</dict>
 				<dict>
@@ -6962,17 +6962,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>3</key>
+							<key>4</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>Classes/IncomingCallViewController~ipad/3/IncomingCallViewController~ipad.xib</string>
+								<string>Classes/IncomingCallViewController~ipad/4/IncomingCallViewController~ipad.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-27T09:37:07Z</date>
+					<date>2012-10-02T09:37:05Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -6982,7 +6982,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>313a649f8ff1d14d828648af3463428c
+					<string>018c47f78a17f0dc34ef27eaac216fa4
 </string>
 					<key>name</key>
 					<string>IncomingCallViewController~ipad.xib</string>
@@ -7342,9 +7342,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>3</string>
+						<string>4</string>
 						<key>fr</key>
-						<string>3</string>
+						<string>4</string>
 					</dict>
 				</dict>
 			</array>
@@ -9693,17 +9693,17 @@
 								<key>name</key>
 								<string>LinphoneUI/UIConferenceHeader/1/UIConferenceHeader.xib</string>
 							</dict>
-							<key>3</key>
+							<key>6</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>LinphoneUI/UIConferenceHeader/3/UIConferenceHeader.xib</string>
+								<string>LinphoneUI/UIConferenceHeader/6/UIConferenceHeader.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-25T09:16:22Z</date>
+					<date>2012-10-02T09:50:56Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -9713,37 +9713,12 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>6b2fc885020930eed8cc187bf1383346
+					<string>babefbbde2a145648dcdf274fe3429a9
 </string>
 					<key>name</key>
 					<string>UIConferenceHeader.xib</string>
 					<key>objects</key>
 					<array>
-						<dict>
-							<key>change date</key>
-							<date>2001-01-01T00:00:00Z</date>
-							<key>changed values</key>
-							<array/>
-							<key>class</key>
-							<string>BLStringKeyObject</string>
-							<key>comment</key>
-							<string>Class = "IBUIImageView"; accessibilityLabel = "Conference"; ObjectID = "7";</string>
-							<key>errors</key>
-							<array/>
-							<key>flags</key>
-							<integer>0</integer>
-							<key>key</key>
-							<string>7.accessibilityLabel</string>
-							<key>localizations</key>
-							<dict>
-								<key>en</key>
-								<string>Conference</string>
-								<key>fr</key>
-								<string>Conférence</string>
-							</dict>
-							<key>snapshots</key>
-							<dict/>
-						</dict>
 						<dict>
 							<key>change date</key>
 							<date>2001-01-01T00:00:00Z</date>
@@ -9769,17 +9744,95 @@
 							<key>snapshots</key>
 							<dict/>
 						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>changed values</key>
+							<array/>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Class = "IBUILabel"; accessibilityLabel = "Conference"; ObjectID = "15";</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>1</integer>
+							<key>key</key>
+							<string>15.accessibilityLabel</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Conference</string>
+								<key>fr</key>
+								<string>Conférence</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>changed values</key>
+							<array/>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Class = "IBUILabel"; text = "Conference"; ObjectID = "15";</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>15.text</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Conference</string>
+								<key>fr</key>
+								<string>Conférence</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
 					</array>
 					<key>old objects</key>
-					<array/>
+					<array>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>changed values</key>
+							<array>
+								<string>&lt;reference&gt;</string>
+							</array>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Class = "IBUIImageView"; accessibilityLabel = "Conference"; ObjectID = "7";</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>7.accessibilityLabel</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Conference</string>
+								<key>fr</key>
+								<string>Conférence</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+					</array>
 					<key>snapshots</key>
 					<dict/>
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>3</string>
+						<string>6</string>
 						<key>fr</key>
-						<string>3</string>
+						<string>6</string>
 						<key>fr_FR</key>
 						<string>1</string>
 					</dict>
diff --git a/linphone.ldb/Resources/Classes/IncomingCallViewController/8/IncomingCallViewController.xib b/linphone.ldb/Resources/Classes/IncomingCallViewController/9/IncomingCallViewController.xib
similarity index 99%
rename from linphone.ldb/Resources/Classes/IncomingCallViewController/8/IncomingCallViewController.xib
rename to linphone.ldb/Resources/Classes/IncomingCallViewController/9/IncomingCallViewController.xib
index 576d66f2e..0fa14357c 100644
--- a/linphone.ldb/Resources/Classes/IncomingCallViewController/8/IncomingCallViewController.xib
+++ b/linphone.ldb/Resources/Classes/IncomingCallViewController/9/IncomingCallViewController.xib
@@ -46,7 +46,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 49}, {320, 63}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1040531505"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">2</int>
@@ -62,7 +61,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{320, 68}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="131610915"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">3</int>
@@ -82,7 +80,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{20, 0}, {280, 50}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="651495339"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -117,7 +114,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{10, 53}, {300, 51}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="632401698"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -4542,7 +4538,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">293</int>
 								<string key="NSFrame">{{0, 96}, {320, 262}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="402572557"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">6</int>
@@ -4558,7 +4553,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">293</int>
 								<string key="NSFrame">{{80, 113}, {160, 170}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="442322210"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">7</int>
@@ -4577,7 +4571,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 						</array>
 						<string key="NSFrameSize">{320, 395}</string>
 						<reference key="NSSuperview" ref="311908381"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1023112121"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="84179139"/>
@@ -4593,7 +4586,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">-2147483374</int>
 								<string key="NSFrame">{{0, 10}, {320, 67}}</string>
 								<reference key="NSSuperview" ref="442322210"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="348909292"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@@ -4612,7 +4604,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">278</int>
 								<string key="NSFrameSize">{160, 77}</string>
 								<reference key="NSSuperview" ref="442322210"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="299451957"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -4650,7 +4641,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">275</int>
 								<string key="NSFrame">{{160, 0}, {160, 77}}</string>
 								<reference key="NSSuperview" ref="442322210"/>
-								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<int key="IBUITag">12</int>
@@ -4675,7 +4665,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 						</array>
 						<string key="NSFrame">{{0, 383}, {320, 77}}</string>
 						<reference key="NSSuperview" ref="311908381"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="908036430"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="84179139"/>
@@ -4685,7 +4674,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="735497316"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="84179139"/>
@@ -4879,68 +4867,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 			<nil key="sourceID"/>
 			<int key="maxID">32</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">IncomingCallViewController</string>
-					<string key="superclassName">TPMultiLayoutViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onAcceptClick:">id</string>
-						<string key="onDeclineClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onAcceptClick:">
-							<string key="name">onAcceptClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onDeclineClick:">
-							<string key="name">onDeclineClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addressLabel">UILabel</string>
-						<string key="avatarImage">UIImageView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addressLabel">
-							<string key="name">addressLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="avatarImage">
-							<string key="name">avatarImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/IncomingCallViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TPMultiLayoutViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="landscapeView">UIView</string>
-						<string key="portraitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="landscapeView">
-							<string key="name">landscapeView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="portraitView">
-							<string key="name">portraitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
diff --git a/linphone.ldb/Resources/Classes/IncomingCallViewController~ipad/3/IncomingCallViewController~ipad.xib b/linphone.ldb/Resources/Classes/IncomingCallViewController~ipad/4/IncomingCallViewController~ipad.xib
similarity index 99%
rename from linphone.ldb/Resources/Classes/IncomingCallViewController~ipad/3/IncomingCallViewController~ipad.xib
rename to linphone.ldb/Resources/Classes/IncomingCallViewController~ipad/4/IncomingCallViewController~ipad.xib
index 2e97c9907..324aade88 100644
--- a/linphone.ldb/Resources/Classes/IncomingCallViewController~ipad/3/IncomingCallViewController~ipad.xib
+++ b/linphone.ldb/Resources/Classes/IncomingCallViewController~ipad/4/IncomingCallViewController~ipad.xib
@@ -46,7 +46,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, -2000}, {768, 2000}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1023112121"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@@ -61,7 +60,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 49}, {768, 63}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1040531505"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">2</int>
@@ -77,7 +75,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{768, 68}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="131610915"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">3</int>
@@ -97,7 +94,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{20, 0}, {728, 50}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="402572557"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -132,7 +128,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{10, 53}, {748, 51}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="651495339"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -4557,7 +4552,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">293</int>
 								<string key="NSFrame">{{224, 96}, {320, 262}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="632401698"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">6</int>
@@ -4573,7 +4567,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">293</int>
 								<string key="NSFrame">{{304, 113}, {160, 170}}</string>
 								<reference key="NSSuperview" ref="735497316"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="442322210"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">7</int>
@@ -4592,7 +4585,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 						</array>
 						<string key="NSFrameSize">{768, 958}</string>
 						<reference key="NSSuperview" ref="311908381"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="998666105"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="84179139"/>
@@ -4608,8 +4600,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{-1000, 77}, {2768, 2000}}</string>
 								<reference key="NSSuperview" ref="442322210"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@@ -4623,7 +4613,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">-2147483374</int>
 								<string key="NSFrame">{{0, 10}, {768, 67}}</string>
 								<reference key="NSSuperview" ref="442322210"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="348909292"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@@ -4642,7 +4631,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">278</int>
 								<string key="NSFrameSize">{384, 77}</string>
 								<reference key="NSSuperview" ref="442322210"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="299451957"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -4680,7 +4668,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">275</int>
 								<string key="NSFrame">{{384, 0}, {384, 77}}</string>
 								<reference key="NSSuperview" ref="442322210"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="741669707"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -4706,7 +4693,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 						</array>
 						<string key="NSFrame">{{0, 947}, {768, 77}}</string>
 						<reference key="NSSuperview" ref="311908381"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="908036430"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="84179139"/>
@@ -4716,7 +4702,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 				</array>
 				<string key="NSFrameSize">{768, 1024}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="735497316"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="84179139"/>
@@ -4735,7 +4720,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, -2000}, {1024, 2000}}</string>
 								<reference key="NSSuperview" ref="947839834"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="62199849"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@@ -4750,7 +4734,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 49}, {1024, 63}}</string>
 								<reference key="NSSuperview" ref="947839834"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1071149854"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">2</int>
@@ -4763,7 +4746,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{1024, 68}</string>
 								<reference key="NSSuperview" ref="947839834"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="245587345"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">3</int>
@@ -4780,7 +4762,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{20, 0}, {984, 50}}</string>
 								<reference key="NSSuperview" ref="947839834"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="662162891"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -4808,7 +4789,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{10, 53}, {1004, 51}}</string>
 								<reference key="NSSuperview" ref="947839834"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="364248021"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -4833,7 +4813,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">293</int>
 								<string key="NSFrame">{{352, 96}, {320, 262}}</string>
 								<reference key="NSSuperview" ref="947839834"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="586380894"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">6</int>
@@ -4846,7 +4825,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">293</int>
 								<string key="NSFrame">{{432, 113}, {160, 170}}</string>
 								<reference key="NSSuperview" ref="947839834"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="741290713"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">7</int>
@@ -4862,7 +4840,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 						</array>
 						<string key="NSFrameSize">{1024, 702}</string>
 						<reference key="NSSuperview" ref="174518676"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="455638695"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="84179139"/>
@@ -4878,8 +4855,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{-1000, 86}, {3024, 2000}}</string>
 								<reference key="NSSuperview" ref="741290713"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@@ -4893,7 +4868,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">-2147483374</int>
 								<string key="NSFrame">{{0, 19}, {1024, 67}}</string>
 								<reference key="NSSuperview" ref="741290713"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="634288753"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@@ -4910,7 +4884,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">278</int>
 								<string key="NSFrameSize">{512, 86}</string>
 								<reference key="NSSuperview" ref="741290713"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1015924616"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -4938,7 +4911,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 								<int key="NSvFlags">275</int>
 								<string key="NSFrame">{{512, 0}, {512, 86}}</string>
 								<reference key="NSSuperview" ref="741290713"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="766058250"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -4964,7 +4936,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 						</array>
 						<string key="NSFrame">{{0, 682}, {1024, 86}}</string>
 						<reference key="NSSuperview" ref="174518676"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="794929616"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="84179139"/>
@@ -4974,7 +4945,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 				</array>
 				<string key="NSFrameSize">{1024, 768}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="947839834"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="84179139"/>
@@ -5329,68 +5299,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 			<nil key="sourceID"/>
 			<int key="maxID">80</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">IncomingCallViewController</string>
-					<string key="superclassName">TPMultiLayoutViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onAcceptClick:">id</string>
-						<string key="onDeclineClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onAcceptClick:">
-							<string key="name">onAcceptClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onDeclineClick:">
-							<string key="name">onDeclineClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="addressLabel">UILabel</string>
-						<string key="avatarImage">UIImageView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="addressLabel">
-							<string key="name">addressLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="avatarImage">
-							<string key="name">avatarImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/IncomingCallViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TPMultiLayoutViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="landscapeView">UIView</string>
-						<string key="portraitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="landscapeView">
-							<string key="name">landscapeView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="portraitView">
-							<string key="name">portraitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
diff --git a/linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/3/UIConferenceHeader.xib b/linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/6/UIConferenceHeader.xib
similarity index 72%
rename from linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/3/UIConferenceHeader.xib
rename to linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/6/UIConferenceHeader.xib
index a70dc3dc7..34e2154e0 100644
--- a/linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/3/UIConferenceHeader.xib
+++ b/linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/6/UIConferenceHeader.xib
@@ -14,6 +14,7 @@
 			<string>IBProxyObject</string>
 			<string>IBUIButton</string>
 			<string>IBUIImageView</string>
+			<string>IBUILabel</string>
 			<string>IBUIView</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
@@ -41,13 +42,14 @@
 						<int key="NSvFlags">290</int>
 						<string key="NSFrameSize">{320, 68}</string>
 						<reference key="NSSuperview" ref="232140160"/>
-						<reference key="NSNextKeyView" ref="735354432"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="35074700"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-							<string key="IBUIAccessibilityLabel">Conference</string>
+							<string key="IBUIAccessibilityLabel"/>
 							<integer value="260" key="IBUIAccessibilityTraits"/>
-							<boolean value="YES" key="IBUIIsAccessibilityElement"/>
+							<boolean value="NO" key="IBUIIsAccessibilityElement"/>
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<object class="NSCustomResource" key="IBUIImage">
@@ -55,21 +57,48 @@
 							<string key="NSResourceName">header_conference.png</string>
 						</object>
 					</object>
-					<object class="IBUIImageView" id="242054672">
+					<object class="IBUILabel" id="35074700">
 						<reference key="NSNextResponder" ref="232140160"/>
-						<int key="NSvFlags">289</int>
-						<string key="NSFrame">{{224, 14}, {25, 25}}</string>
+						<int key="NSvFlags">290</int>
+						<string key="NSFrame">{{10, -3}, {206, 50}}</string>
 						<reference key="NSSuperview" ref="232140160"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="735354432"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<bool key="IBUIClipsSubviews">YES</bool>
+						<int key="IBUIContentMode">7</int>
+						<int key="IBUITag">4</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
+						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+							<string key="IBUIAccessibilityLabel">Conference</string>
+						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<string key="IBUIText">Conference</string>
+						<object class="NSColor" key="IBUITextColor">
+							<int key="NSColorSpace">2</int>
+							<bytes key="NSRGB">MC43MjU0OTAyMTI0IDAuNzY4NjI3NDY0OCAwLjc5NjA3ODQ0MzUAA</bytes>
+						</object>
+						<nil key="IBUIHighlightedColor"/>
+						<int key="IBUIBaselineAdjustment">0</int>
+						<object class="IBUIFontDescription" key="IBUIFontDescription">
+							<int key="type">2</int>
+							<double key="pointSize">27</double>
+						</object>
+						<object class="NSFont" key="IBUIFont">
+							<string key="NSName">Helvetica-Bold</string>
+							<double key="NSSize">27</double>
+							<int key="NSfFlags">16</int>
+						</object>
+						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 					</object>
 					<object class="IBUIButton" id="735354432">
 						<reference key="NSNextResponder" ref="232140160"/>
 						<int key="NSvFlags">289</int>
 						<string key="NSFrame">{{216, 6}, {41, 41}}</string>
 						<reference key="NSSuperview" ref="232140160"/>
-						<reference key="NSNextKeyView" ref="242054672"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -113,6 +142,7 @@
 				</array>
 				<string key="NSFrameSize">{320, 68}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="1047549470"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -122,7 +152,6 @@
 						<int key="NSID">2</int>
 					</object>
 				</object>
-				<bool key="IBUIAutoresizesSubviews">NO</bool>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 		</array>
@@ -136,14 +165,6 @@
 					</object>
 					<int key="connectionID">5</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">stateImage</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="242054672"/>
-					</object>
-					<int key="connectionID">9</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">pauseButton</string>
@@ -177,8 +198,8 @@
 						<reference key="object" ref="232140160"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="1047549470"/>
-							<reference ref="242054672"/>
 							<reference ref="735354432"/>
+							<reference ref="35074700"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -188,18 +209,18 @@
 						<reference key="parent" ref="232140160"/>
 						<string key="objectName">backgroundImage</string>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">8</int>
-						<reference key="object" ref="242054672"/>
-						<reference key="parent" ref="232140160"/>
-						<string key="objectName">stateImage</string>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">13</int>
 						<reference key="object" ref="735354432"/>
 						<reference key="parent" ref="232140160"/>
 						<string key="objectName">pauseButton</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="35074700"/>
+						<reference key="parent" ref="232140160"/>
+						<string key="objectName">headerLabel</string>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -209,18 +230,59 @@
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="13.CustomClassName">UIPauseButton</string>
 				<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="2" key="13.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<real value="0.0" key="13.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">14</int>
+			<int key="maxID">15</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">UIConferenceHeader</string>
+					<string key="superclassName">UIViewController</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="pauseButton">UIPauseButton</string>
+						<string key="stateImage">UIImageView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="pauseButton">
+							<string key="name">pauseButton</string>
+							<string key="candidateClassName">UIPauseButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="stateImage">
+							<string key="name">stateImage</string>
+							<string key="candidateClassName">UIImageView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIConferenceHeader.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIPauseButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIPauseButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIToggleButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIToggleButton.h</string>
+					</object>
+				</object>
+			</array>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>