diff --git a/Classes/VideoViewController.h b/Classes/VideoViewController.h
index 569d45b44..d6db828b0 100644
--- a/Classes/VideoViewController.h
+++ b/Classes/VideoViewController.h
@@ -20,17 +20,34 @@
 #import "UILinphone.h"
 
 @interface VideoViewController : UIViewController {
-	UIImageView* mDisplay;
+	UIView* mPortrait;
+	UIView* mDisplay;
 	UIView* mPreview;
 	UIMuteButton* mMute;
 	UIHangUpButton* mHangUp;
 	UICamSwitch* mCamSwitch;
+	
+	UIView* mLandscape;
+	UIView* mDisplayLand;
+	UIView* mPreviewLand;
+	UIMuteButton* mMuteLand;
+	UIHangUpButton* mHangUpLand;
+	UICamSwitch* mCamSwitchLand;
+	BOOL isFirst;
 
 }
 
-@property (nonatomic, retain) IBOutlet UIImageView* mDisplay;
+@property (nonatomic, retain) IBOutlet UIView* mPortrait;
+@property (nonatomic, retain) IBOutlet UIView* mDisplay;
 @property (nonatomic, retain) IBOutlet UIView* mPreview;
 @property (nonatomic, retain) IBOutlet UIMuteButton* mMute;
 @property (nonatomic, retain) IBOutlet UIHangUpButton* mHangUp;
 @property (nonatomic, retain) IBOutlet UICamSwitch* mCamSwitch;
+
+@property (nonatomic, retain) IBOutlet UIView* mLandscape;
+@property (nonatomic, retain) IBOutlet UIView* mDisplayLand;
+@property (nonatomic, retain) IBOutlet UIView* mPreviewLand;
+@property (nonatomic, retain) IBOutlet UIMuteButton* mMuteLand;
+@property (nonatomic, retain) IBOutlet UIHangUpButton* mHangUpLand;
+@property (nonatomic, retain) IBOutlet UICamSwitch* mCamSwitchLand;
 @end
\ No newline at end of file
diff --git a/Classes/VideoViewController.m b/Classes/VideoViewController.m
index e0adcd168..50bb1ecf8 100644
--- a/Classes/VideoViewController.m
+++ b/Classes/VideoViewController.m
@@ -22,12 +22,20 @@
 #import <AudioToolbox/AudioToolbox.h>
 
 @implementation VideoViewController
+@synthesize mPortrait;
 @synthesize mDisplay;
 @synthesize mPreview;
 @synthesize mMute;
 @synthesize mHangUp;
 @synthesize mCamSwitch;
 
+@synthesize mLandscape;
+@synthesize mDisplayLand;
+@synthesize mPreviewLand;
+@synthesize mMuteLand;
+@synthesize mHangUpLand;
+@synthesize mCamSwitchLand;
+
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
     self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
@@ -56,9 +64,29 @@
 {
     [super viewDidLoad];
 	[mMute initWithOnImage:[UIImage imageNamed:@"mic_muted.png"]  offImage:[UIImage imageNamed:@"mic_active.png"] ];
+	[mMuteLand initWithOnImage:[UIImage imageNamed:@"mic_muted.png"]  offImage:[UIImage imageNamed:@"mic_active.png"] ];
 	[mCamSwitch setPreview:mPreview];
+	[mCamSwitchLand setPreview:mPreviewLand];
+	isFirst=TRUE;
 }
 
+
+-(void) configureOrientation:(UIInterfaceOrientation) oritentation  {
+	
+	if (oritentation == UIInterfaceOrientationPortrait ) {
+		[self.view addSubview:mPortrait];
+		linphone_core_set_native_video_window_id([LinphoneManager getLc],(unsigned long)mDisplay);	
+		linphone_core_set_native_preview_window_id([LinphoneManager getLc],(unsigned long)mPreview);
+		linphone_core_set_device_rotation([LinphoneManager getLc], 0);
+		
+	} else if (oritentation == UIInterfaceOrientationLandscapeRight ) {
+		[self.view addSubview:mLandscape];
+		linphone_core_set_native_video_window_id([LinphoneManager getLc],(unsigned long)mDisplayLand);	
+		linphone_core_set_native_preview_window_id([LinphoneManager getLc],(unsigned long)mPreviewLand);
+		linphone_core_set_device_rotation([LinphoneManager getLc], 270);
+	}
+	
+}
 - (void)viewDidUnload
 {
     [super viewDidUnload];
@@ -72,8 +100,6 @@
 -(void) viewWillAppear:(BOOL)animated {
 	[super viewWillAppear:animated];
     
-	linphone_core_set_native_video_window_id([LinphoneManager getLc],(unsigned long)mDisplay);	
-	linphone_core_set_native_preview_window_id([LinphoneManager getLc],(unsigned long)mPreview);
 	
     //redirect audio to speaker
 	UInt32 audioRouteOverride = kAudioSessionOverrideAudioRoute_Speaker;  
@@ -82,10 +108,19 @@
 							 , &audioRouteOverride);
 }
 
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
-{
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
     // Return YES for supported orientations
-    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+    return  interfaceOrientation == UIInterfaceOrientationPortrait || interfaceOrientation == UIInterfaceOrientationLandscapeRight ;
 }
 
+- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
+	[self configureOrientation:self.interfaceOrientation];
+	if (fromInterfaceOrientation !=self.interfaceOrientation) {
+		linphone_core_update_call([LinphoneManager getLc], linphone_core_get_current_call([LinphoneManager getLc]), NULL);
+	} 
+}
+- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
+	[mLandscape removeFromSuperview];
+	[mPortrait removeFromSuperview];
+}
 @end
diff --git a/Classes/VideoViewController.xib b/Classes/VideoViewController.xib
index 299cc07b7..e6af95120 100644
--- a/Classes/VideoViewController.xib
+++ b/Classes/VideoViewController.xib
@@ -38,6 +38,17 @@
 				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
+			<object class="IBUIView" id="82063733">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">292</int>
+				<string key="NSFrameSize">{320, 460}</string>
+				<reference key="NSSuperview"/>
+				<object class="NSColor" key="IBUIBackgroundColor">
+					<int key="NSColorSpace">1</int>
+					<bytes key="NSRGB">MCAwIDAAA</bytes>
+				</object>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
 			<object class="IBUIView" id="191373211">
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">274</int>
@@ -48,7 +59,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrameSize">{320, 420}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="955352536"/>
 						<int key="IBUIContentMode">1</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -59,7 +69,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{1, 418}, {108, 62}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="695487530"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -92,7 +101,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{106, 418}, {106, 63}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="383499753"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -105,7 +113,7 @@
 							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
 						</object>
 						<reference key="IBUINormalTitleShadowColor" ref="19777660"/>
-						<object class="NSCustomResource" key="IBUINormalImage">
+						<object class="NSCustomResource" key="IBUINormalImage" id="758660083">
 							<string key="NSClassName">NSImage</string>
 							<string key="NSResourceName">stopcall-red.png</string>
 						</object>
@@ -116,8 +124,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{211, 418}, {108, 62}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
@@ -138,12 +144,11 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{216, 263}, {96, 128}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="477702441"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MQA</bytes>
-							<object class="NSColorSpace" key="NSCustomColorSpace">
+							<object class="NSColorSpace" key="NSCustomColorSpace" id="409833800">
 								<int key="NSID">2</int>
 							</object>
 						</object>
@@ -152,7 +157,6 @@
 				</object>
 				<string key="NSFrameSize">{320, 480}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="733070734"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@@ -160,18 +164,121 @@
 				</object>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
+			<object class="IBUIView" id="977413659">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">292</int>
+				<object class="NSMutableArray" key="NSSubviews">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="IBUIView" id="858597805">
+						<reference key="NSNextResponder" ref="977413659"/>
+						<int key="NSvFlags">274</int>
+						<string key="NSFrameSize">{420, 320}</string>
+						<reference key="NSSuperview" ref="977413659"/>
+						<reference key="NSNextKeyView" ref="124303267"/>
+						<object class="NSColor" key="IBUIBackgroundColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MQA</bytes>
+							<reference key="NSCustomColorSpace" ref="409833800"/>
+						</object>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+					<object class="IBUIButton" id="1050670507">
+						<reference key="NSNextResponder" ref="977413659"/>
+						<int key="NSvFlags">292</int>
+						<string key="NSFrame">{{420, 0}, {60, 108}}</string>
+						<reference key="NSSuperview" ref="977413659"/>
+						<reference key="NSNextKeyView" ref="335958099"/>
+						<bool key="IBUIOpaque">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<reference key="IBUIFont" ref="996800421"/>
+						<reference key="IBUIHighlightedTitleColor" ref="770254705"/>
+						<object class="NSColor" key="IBUINormalTitleColor">
+							<int key="NSColorSpace">1</int>
+							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+						</object>
+						<reference key="IBUINormalTitleShadowColor" ref="19777660"/>
+						<object class="NSCustomResource" key="IBUINormalImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">mic_active.png</string>
+						</object>
+						<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="1036362337">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">clavier-01-106px.png</string>
+						</object>
+					</object>
+					<object class="IBUIButton" id="335958099">
+						<reference key="NSNextResponder" ref="977413659"/>
+						<int key="NSvFlags">292</int>
+						<string key="NSFrame">{{420, 107}, {60, 106}}</string>
+						<reference key="NSSuperview" ref="977413659"/>
+						<reference key="NSNextKeyView" ref="676617489"/>
+						<bool key="IBUIOpaque">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<reference key="IBUIFont" ref="996800421"/>
+						<reference key="IBUIHighlightedTitleColor" ref="770254705"/>
+						<object class="NSColor" key="IBUINormalTitleColor">
+							<int key="NSColorSpace">1</int>
+							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+						</object>
+						<reference key="IBUINormalTitleShadowColor" ref="19777660"/>
+						<reference key="IBUINormalImage" ref="758660083"/>
+						<reference key="IBUINormalBackgroundImage" ref="1036362337"/>
+					</object>
+					<object class="IBUIButton" id="676617489">
+						<reference key="NSNextResponder" ref="977413659"/>
+						<int key="NSvFlags">292</int>
+						<string key="NSFrame">{{420, 212}, {60, 108}}</string>
+						<reference key="NSSuperview" ref="977413659"/>
+						<bool key="IBUIOpaque">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<reference key="IBUIFont" ref="996800421"/>
+						<string key="IBUINormalTitle">Switch</string>
+						<reference key="IBUIHighlightedTitleColor" ref="770254705"/>
+						<object class="NSColor" key="IBUINormalTitleColor">
+							<int key="NSColorSpace">1</int>
+							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+						</object>
+						<reference key="IBUINormalTitleShadowColor" ref="19777660"/>
+						<reference key="IBUINormalBackgroundImage" ref="1036362337"/>
+					</object>
+					<object class="IBUIView" id="124303267">
+						<reference key="NSNextResponder" ref="977413659"/>
+						<int key="NSvFlags">274</int>
+						<string key="NSFrame">{{264, 210}, {142, 96}}</string>
+						<reference key="NSSuperview" ref="977413659"/>
+						<reference key="NSNextKeyView" ref="1050670507"/>
+						<object class="NSColor" key="IBUIBackgroundColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MQA</bytes>
+							<reference key="NSCustomColorSpace" ref="409833800"/>
+						</object>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+				</object>
+				<string key="NSFrameSize">{480, 320}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSNextKeyView" ref="858597805"/>
+				<object class="NSColor" key="IBUIBackgroundColor">
+					<int key="NSColorSpace">3</int>
+					<bytes key="NSWhite">MQA</bytes>
+					<reference key="NSCustomColorSpace" ref="409833800"/>
+				</object>
+				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+					<int key="IBUIInterfaceOrientation">3</int>
+					<int key="interfaceOrientation">3</int>
+				</object>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="191373211"/>
-					</object>
-					<int key="connectionID">3</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">mDisplay</string>
@@ -204,6 +311,78 @@
 					</object>
 					<int key="connectionID">13</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">mPortrait</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="191373211"/>
+					</object>
+					<int key="connectionID">21</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">mLandscape</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="977413659"/>
+					</object>
+					<int key="connectionID">22</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">mDisplayLand</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="858597805"/>
+					</object>
+					<int key="connectionID">23</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">mPreviewLand</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="124303267"/>
+					</object>
+					<int key="connectionID">24</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">mHangUp</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="695487530"/>
+					</object>
+					<int key="connectionID">26</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">mMuteLand</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="1050670507"/>
+					</object>
+					<int key="connectionID">27</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">mHangUpLand</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="335958099"/>
+					</object>
+					<int key="connectionID">28</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">mCamSwitchLand</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="676617489"/>
+					</object>
+					<int key="connectionID">29</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="82063733"/>
+					</object>
+					<int key="connectionID">32</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -214,20 +393,6 @@
 						<reference key="children" ref="1000"/>
 						<nil key="parent"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="191373211"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="733070734"/>
-							<reference ref="955352536"/>
-							<reference ref="477702441"/>
-							<reference ref="695487530"/>
-							<reference ref="383499753"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">View</string>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">-1</int>
 						<reference key="object" ref="372490531"/>
@@ -239,12 +404,41 @@
 						<reference key="object" ref="975951072"/>
 						<reference key="parent" ref="0"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">31</int>
+						<reference key="object" ref="82063733"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">root</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="191373211"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="733070734"/>
+							<reference ref="955352536"/>
+							<reference ref="477702441"/>
+							<reference ref="695487530"/>
+							<reference ref="383499753"/>
+						</object>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">portrait</string>
+					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">5</int>
 						<reference key="object" ref="733070734"/>
 						<reference key="parent" ref="191373211"/>
 						<string key="objectName">display</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="955352536"/>
+						<reference key="parent" ref="191373211"/>
+						<string key="objectName">preview</string>
+					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">6</int>
 						<reference key="object" ref="477702441"/>
@@ -254,6 +448,7 @@
 						<int key="objectID">7</int>
 						<reference key="object" ref="695487530"/>
 						<reference key="parent" ref="191373211"/>
+						<string key="objectName">Hang Up Button</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">8</int>
@@ -261,11 +456,52 @@
 						<reference key="parent" ref="191373211"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">9</int>
-						<reference key="object" ref="955352536"/>
-						<reference key="parent" ref="191373211"/>
+						<int key="objectID">14</int>
+						<reference key="object" ref="977413659"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="858597805"/>
+							<reference ref="1050670507"/>
+							<reference ref="335958099"/>
+							<reference ref="676617489"/>
+							<reference ref="124303267"/>
+						</object>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">landscape</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="676617489"/>
+						<reference key="parent" ref="977413659"/>
+						<string key="objectName">Cam Switch</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">18</int>
+						<reference key="object" ref="335958099"/>
+						<reference key="parent" ref="977413659"/>
+						<string key="objectName">HangHup</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">17</int>
+						<reference key="object" ref="1050670507"/>
+						<reference key="parent" ref="977413659"/>
+						<string key="objectName">Mute</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">16</int>
+						<reference key="object" ref="124303267"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<reference key="parent" ref="977413659"/>
 						<string key="objectName">preview</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="858597805"/>
+						<reference key="parent" ref="977413659"/>
+						<string key="objectName">display</string>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -276,6 +512,16 @@
 					<string>-2.CustomClassName</string>
 					<string>1.IBEditorWindowLastContentRect</string>
 					<string>1.IBPluginDependency</string>
+					<string>14.IBPluginDependency</string>
+					<string>15.IBPluginDependency</string>
+					<string>16.IBPluginDependency</string>
+					<string>17.CustomClassName</string>
+					<string>17.IBPluginDependency</string>
+					<string>18.CustomClassName</string>
+					<string>18.IBPluginDependency</string>
+					<string>19.CustomClassName</string>
+					<string>19.IBPluginDependency</string>
+					<string>31.IBPluginDependency</string>
 					<string>5.IBPluginDependency</string>
 					<string>6.CustomClassName</string>
 					<string>6.IBPluginDependency</string>
@@ -292,6 +538,16 @@
 					<string>{{556, 412}, {320, 480}}</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>UIMuteButton</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>UIHangUpButton</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>UICamSwitch</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UIMuteButton</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UIHangUpButton</string>
@@ -313,117 +569,9 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">13</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">UICamSwitch</string>
-					<string key="superclassName">UIButton</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">preview</string>
-						<string key="NS.object.0">UIView</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">preview</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">preview</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UICamSwitch.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIHangUpButton</string>
-					<string key="superclassName">UIButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIHangUpButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIMuteButton</string>
-					<string key="superclassName">UIToggleButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIMuteButton.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>
-				<object class="IBPartialClassDescription">
-					<string key="className">VideoViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>mCamSwitch</string>
-							<string>mDisplay</string>
-							<string>mHangUp</string>
-							<string>mMute</string>
-							<string>mPreview</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>UICamSwitch</string>
-							<string>UIImageView</string>
-							<string>UIHangUpButton</string>
-							<string>UIMuteButton</string>
-							<string>UIView</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>mCamSwitch</string>
-							<string>mDisplay</string>
-							<string>mHangUp</string>
-							<string>mMute</string>
-							<string>mPreview</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">mCamSwitch</string>
-								<string key="candidateClassName">UICamSwitch</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">mDisplay</string>
-								<string key="candidateClassName">UIImageView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">mHangUp</string>
-								<string key="candidateClassName">UIHangUpButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">mMute</string>
-								<string key="candidateClassName">UIMuteButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">mPreview</string>
-								<string key="candidateClassName">UIView</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/VideoViewController.h</string>
-					</object>
-				</object>
-			</object>
+			<int key="maxID">33</int>
 		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
@@ -436,12 +584,16 @@
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<object class="NSArray" key="dict.sortedKeys">
 				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>clavier-01-106px.png</string>
 				<string>clavier-01-108px.png</string>
+				<string>mic_active.png</string>
 				<string>stopcall-red.png</string>
 			</object>
 			<object class="NSMutableArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>{106, 60}</string>
 				<string>{108, 60}</string>
+				<string>{32, 32}</string>
 				<string>{62, 54}</string>
 			</object>
 		</object>
diff --git a/submodules/linphone b/submodules/linphone
index 406c3a101..c51752fe7 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 406c3a1019964463a0565488f7bf746fc8bab360
+Subproject commit c51752fe70f7dd4e892ba87d00284095edda33e2