diff --git a/Classes/ChatViewController.m b/Classes/ChatViewController.m
index 3c1a294a5..ffd9008de 100644
--- a/Classes/ChatViewController.m
+++ b/Classes/ChatViewController.m
@@ -39,6 +39,7 @@
     
     [tableController release];
     [editButton release];
+    [addressField release];
     
     [super dealloc];
 }
diff --git a/Classes/DialerViewController.h b/Classes/DialerViewController.h
index ef088b355..c23b7218f 100644
--- a/Classes/DialerViewController.h
+++ b/Classes/DialerViewController.h
@@ -22,6 +22,7 @@
 #import "UICompositeViewController.h"
 
 #import "UIEraseButton.h"
+#import "UICamSwitch.h"
 #import "UICallButton.h"
 #import "UITransferButton.h"
 #import "UIDigitButton.h"
@@ -55,6 +56,8 @@
 @property (nonatomic, retain) IBOutlet UIDigitButton* starButton;
 @property (nonatomic, retain) IBOutlet UIDigitButton* zeroButton;
 @property (nonatomic, retain) IBOutlet UIDigitButton* sharpButton;
+@property (nonatomic, retain) IBOutlet UIView* videoPreview;
+@property (nonatomic, retain) IBOutlet UICamSwitch* videoCameraSwitch;
 
 - (IBAction)onAddContactClick: (id) event;
 - (IBAction)onBackClick: (id) event;
diff --git a/Classes/DialerViewController.m b/Classes/DialerViewController.m
index 707d4a829..9abd60d74 100644
--- a/Classes/DialerViewController.m
+++ b/Classes/DialerViewController.m
@@ -54,6 +54,9 @@
 @synthesize zeroButton;
 @synthesize sharpButton;
 
+@synthesize videoPreview;
+@synthesize videoCameraSwitch;
+
 #pragma mark - Lifecycle Functions
 
 - (id)init {
@@ -86,6 +89,8 @@
 	[zeroButton release];
 	[sharpButton release];
     
+    [videoPreview release];
+    [videoCameraSwitch release];
     
     // Remove all observers
     [[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -130,6 +135,10 @@ static UICompositeViewDescription *compositeDescription = nil;
         LinphoneCallState state = (call != NULL)?linphone_call_get_state(call): 0;
         [self callUpdate:call state:state];
     }
+    
+    if(videoPreview) {
+        linphone_core_set_native_preview_window_id([LinphoneManager getLc], (unsigned long)videoPreview);
+    }
 } 
 
 - (void)viewWillDisappear:(BOOL)animated {
@@ -158,8 +167,48 @@ static UICompositeViewDescription *compositeDescription = nil;
 	[sharpButton   setDigit:'#'];
     
     [addressField setAdjustsFontSizeToFitWidth:TRUE]; // Not put it in IB: issue with placeholder size
+    
+    if([LinphoneManager runningOnIpad]) {
+        linphone_core_enable_video_preview([LinphoneManager getLc], TRUE);
+        
+        if ([LinphoneManager instance].frontCamId != nil) {
+            // only show camera switch button if we have more than 1 camera
+            [videoCameraSwitch setHidden:FALSE];
+        }
+    }
 }
 
+- (void)viewDidUnload {
+    [super viewDidUnload];
+    
+    if([LinphoneManager runningOnIpad]) {
+        linphone_core_enable_video_preview([LinphoneManager getLc], FALSE);
+    }
+}
+
+- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
+    [super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
+    CGRect frame = [videoPreview frame];
+    switch (toInterfaceOrientation) {
+        case UIInterfaceOrientationPortrait:
+            [videoPreview setTransform: CGAffineTransformMakeRotation(0)];
+            break;
+        case UIInterfaceOrientationPortraitUpsideDown:
+            [videoPreview setTransform: CGAffineTransformMakeRotation(M_PI)];
+            break;
+        case UIInterfaceOrientationLandscapeLeft:
+            [videoPreview setTransform: CGAffineTransformMakeRotation(-M_PI / 2)];
+            break;
+        case UIInterfaceOrientationLandscapeRight:
+            [videoPreview setTransform: CGAffineTransformMakeRotation(M_PI / 2)];
+            break;
+        default:
+            break;
+    }
+    [videoPreview setFrame:frame];
+}
+
+
 #pragma mark - Event Functions
 
 - (void)callUpdateEvent:(NSNotification*)notif { 
diff --git a/Classes/InCallViewController.m b/Classes/InCallViewController.m
index a3a6c0a11..26063c382 100644
--- a/Classes/InCallViewController.m
+++ b/Classes/InCallViewController.m
@@ -153,11 +153,17 @@ static UICompositeViewDescription *compositeDescription = nil;
     LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]);
     LinphoneCallState state = (call != NULL)?linphone_call_get_state(call): 0;
     [self callUpdate:call state:state animated:FALSE];
-    [self orientationUpdate:[PhoneMainView instance].interfaceOrientation];
     
     if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
         [callTableController viewDidAppear:animated];
-    }  
+    }
+    
+    // Set windows (warn memory leaks)
+    linphone_core_set_native_video_window_id([LinphoneManager getLc], (unsigned long)videoView);
+    linphone_core_set_native_preview_window_id([LinphoneManager getLc], (unsigned long)videoPreview);
+    
+    // Enable tap
+    [singleFingerTap setEnabled:TRUE];
 }
 
 - (void)viewDidDisappear:(BOOL)animated {
@@ -169,16 +175,15 @@ static UICompositeViewDescription *compositeDescription = nil;
     
     if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
         [callTableController viewDidDisappear:animated];
-    }  
+    }
+    
+    // Disable tap
+    [singleFingerTap setEnabled:FALSE];
 }
 
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    // Set windows (warn memory leaks)
-    linphone_core_set_native_video_window_id([LinphoneManager getLc],(unsigned long)videoView);	
-    linphone_core_set_native_preview_window_id([LinphoneManager getLc],(unsigned long)videoPreview);
-    
     [singleFingerTap setNumberOfTapsRequired:1];
     [singleFingerTap setCancelsTouchesInView: FALSE];
     [[PhoneMainView instance].view addGestureRecognizer:singleFingerTap];
@@ -196,11 +201,6 @@ static UICompositeViewDescription *compositeDescription = nil;
     [[PhoneMainView instance].view removeGestureRecognizer:singleFingerTap];
 }
 
-- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
-    [super willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
-    [self orientationUpdate:toInterfaceOrientation];
-}
-
 - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
     [super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
     CGRect frame = [videoPreview frame];
@@ -226,35 +226,6 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 #pragma mark -
 
-- (void)orientationUpdate:(UIInterfaceOrientation)orientation {
-    int oldLinphoneOrientation = linphone_core_get_device_rotation([LinphoneManager getLc]);
-    int newRotation = 0;
-    switch (orientation) {
-        case UIInterfaceOrientationPortrait:
-            newRotation = 0;
-            break;
-        case UIInterfaceOrientationPortraitUpsideDown:
-            newRotation = 180;
-            break;
-        case UIInterfaceOrientationLandscapeRight:
-            newRotation = 270;
-            break;
-        case UIInterfaceOrientationLandscapeLeft:
-            newRotation = 90;
-            break;
-        default:
-            newRotation = oldLinphoneOrientation;
-    }
-    if (oldLinphoneOrientation != newRotation) {
-        linphone_core_set_device_rotation([LinphoneManager getLc], newRotation);
-        LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]);
-        if (call && linphone_call_params_video_enabled(linphone_call_get_current_params(call))) {
-            //Orientation has changed, must call update call
-            linphone_core_update_call([LinphoneManager getLc], call, NULL);
-        }
-    }
-}
-
 - (void)callUpdate:(LinphoneCall *)call state:(LinphoneCallState)state animated:(BOOL)animated {
     // Update table
     [callTableView reloadData];  
@@ -409,7 +380,7 @@ static UICompositeViewDescription *compositeDescription = nil;
         [videoPreview setHidden:TRUE];
     }
     
-    if ([LinphoneManager instance].frontCamId !=nil) {
+    if ([LinphoneManager instance].frontCamId != nil) {
         // only show camera switch button if we have more than 1 camera
         [videoCameraSwitch setHidden:FALSE];
     }
diff --git a/Classes/LinphoneUI/UICamSwitch.m b/Classes/LinphoneUI/UICamSwitch.m
index bc4a621c3..8dba965ed 100644
--- a/Classes/LinphoneUI/UICamSwitch.m
+++ b/Classes/LinphoneUI/UICamSwitch.m
@@ -82,15 +82,14 @@
         return;
     }
 	if (nextCamId != currentCamId) {
-		[LinphoneLogger logc:LinphoneLoggerLog format:"Switching from [%s] to [%s]",currentCamId,nextCamId];
+		[LinphoneLogger logc:LinphoneLoggerLog format:"Switching from [%s] to [%s]", currentCamId, nextCamId];
 		linphone_core_set_video_device([LinphoneManager getLc], nextCamId);
-		nextCamId=currentCamId;
+		nextCamId = currentCamId;
 		currentCamId = linphone_core_get_video_device([LinphoneManager getLc]);
-		linphone_core_update_call([LinphoneManager getLc]
-								  , linphone_core_get_current_call([LinphoneManager getLc])
-								  , NULL);
-		/*linphone_core_set_native_preview_window_id([LinphoneManager getLc],
-                                                   (unsigned long)preview);*/
+        LinphoneCall *call = linphone_core_get_current_call([LinphoneManager getLc]);
+        if(call != NULL) {
+            linphone_core_update_call([LinphoneManager getLc], call, NULL);
+        }
 	}
 }
 
diff --git a/Classes/LinphoneUI/UIChatCell.m b/Classes/LinphoneUI/UIChatCell.m
index dc6100161..3e1057014 100644
--- a/Classes/LinphoneUI/UIChatCell.m
+++ b/Classes/LinphoneUI/UIChatCell.m
@@ -63,7 +63,14 @@
 #pragma mark - Property Funcitons
 
 - (void)setChat:(ChatModel *)achat {
-    chat = achat;
+    if(chat == achat)
+        return;
+    if(chat != nil) {
+        [chat release];
+    }
+    if(achat) {
+        chat = [achat retain];
+    }
     [self update];
 }
 
diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index 9817aaa1c..c451292b0 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -247,6 +247,7 @@ static PhoneMainView* phoneMainViewInstance=nil;
 - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
     [super willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
     [mainViewController willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
+    [self orientationUpdate:toInterfaceOrientation];
 }
 
 - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
@@ -371,6 +372,35 @@ static PhoneMainView* phoneMainViewInstance=nil;
 
 #pragma mark - 
 
+- (void)orientationUpdate:(UIInterfaceOrientation)orientation {
+    int oldLinphoneOrientation = linphone_core_get_device_rotation([LinphoneManager getLc]);
+    int newRotation = 0;
+    switch (orientation) {
+        case UIInterfaceOrientationPortrait:
+            newRotation = 0;
+            break;
+        case UIInterfaceOrientationPortraitUpsideDown:
+            newRotation = 180;
+            break;
+        case UIInterfaceOrientationLandscapeRight:
+            newRotation = 270;
+            break;
+        case UIInterfaceOrientationLandscapeLeft:
+            newRotation = 90;
+            break;
+        default:
+            newRotation = oldLinphoneOrientation;
+    }
+    if (oldLinphoneOrientation != newRotation) {
+        linphone_core_set_device_rotation([LinphoneManager getLc], newRotation);
+        LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]);
+        if (call && linphone_call_params_video_enabled(linphone_call_get_current_params(call))) {
+            //Orientation has changed, must call update call
+            linphone_core_update_call([LinphoneManager getLc], call, NULL);
+        }
+    }
+}
+
 - (void)startUp {   
     if ([[LinphoneManager instance] lpConfigBoolForKey:@"enable_first_login_view_preference"]  == true) {
         // Change to fist login view
diff --git a/Classes/en.lproj/DialerViewController~ipad.xib b/Classes/en.lproj/DialerViewController~ipad.xib
index c4844b21a..26bc622af 100644
--- a/Classes/en.lproj/DialerViewController~ipad.xib
+++ b/Classes/en.lproj/DialerViewController~ipad.xib
@@ -37,6 +37,73 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
+					<object class="IBUIView" id="887694290">
+						<reference key="NSNextResponder" ref="450916897"/>
+						<int key="NSvFlags">301</int>
+						<string key="NSFrame">{{-1000, -1000}, {2768, 2900}}</string>
+						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="935083036"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<object class="NSColor" key="IBUIBackgroundColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MAA</bytes>
+						</object>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+					</object>
+					<object class="IBUIView" id="820868226">
+						<reference key="NSNextResponder" ref="450916897"/>
+						<int key="NSvFlags">274</int>
+						<string key="NSFrame">{{0, 58}, {768, 842}}</string>
+						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="857979271"/>
+						<object class="NSColor" key="IBUIBackgroundColor" id="474273757">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MCAwAA</bytes>
+						</object>
+						<int key="IBUIContentMode">1</int>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+					</object>
+					<object class="IBUIButton" id="857979271">
+						<reference key="NSNextResponder" ref="450916897"/>
+						<int key="NSvFlags">-2147483356</int>
+						<string key="NSFrame">{{0, 77}, {85, 33}}</string>
+						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="811328787"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+							<string key="IBUIAccessibilityLabel">Switch camera</string>
+						</object>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
+						<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
+						<object class="NSColor" key="IBUINormalTitleShadowColor" id="213950483">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MC41AA</bytes>
+						</object>
+						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">switch_camera_over.png</string>
+						</object>
+						<object class="NSCustomResource" key="IBUINormalBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">switch_camera_default.png</string>
+						</object>
+						<object class="IBUIFontDescription" key="IBUIFontDescription" id="551176679">
+							<int key="type">2</int>
+							<double key="pointSize">15</double>
+						</object>
+						<object class="NSFont" key="IBUIFont" id="733629239">
+							<string key="NSName">Helvetica-Bold</string>
+							<double key="NSSize">15</double>
+							<int key="NSfFlags">16</int>
+						</object>
+					</object>
 					<object class="IBUIView" id="935083036">
 						<reference key="NSNextResponder" ref="450916897"/>
 						<int key="NSvFlags">290</int>
@@ -104,7 +171,7 @@
 								<string key="NSFrame">{{698, 4}, {70, 51}}</string>
 								<reference key="NSSuperview" ref="935083036"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="811328787"/>
+								<reference key="NSNextKeyView" ref="820868226"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -120,10 +187,7 @@
 								<double key="IBUIContentEdgeInsets.bottom">15</double>
 								<double key="IBUIContentEdgeInsets.left">15</double>
 								<double key="IBUIContentEdgeInsets.right">15</double>
-								<object class="NSColor" key="IBUINormalTitleShadowColor" id="213950483">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC41AA</bytes>
-								</object>
+								<reference key="IBUINormalTitleShadowColor" ref="213950483"/>
 								<object class="NSCustomResource" key="IBUIHighlightedImage">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">backspace_over~ipad.png</string>
@@ -136,15 +200,8 @@
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">backspace_default~ipad.png</string>
 								</object>
-								<object class="IBUIFontDescription" key="IBUIFontDescription" id="551176679">
-									<int key="type">2</int>
-									<double key="pointSize">15</double>
-								</object>
-								<object class="NSFont" key="IBUIFont" id="914591064">
-									<string key="NSName">Helvetica-Bold</string>
-									<double key="NSSize">15</double>
-									<int key="NSfFlags">16</int>
-								</object>
+								<reference key="IBUIFontDescription" ref="551176679"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 						</array>
 						<string key="NSFrameSize">{768, 80}</string>
@@ -166,6 +223,22 @@
 						<reference key="NSNextResponder" ref="450916897"/>
 						<int key="NSvFlags">268</int>
 						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="848268216">
+								<reference key="NSNextResponder" ref="811328787"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{320, 280}</string>
+								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="257730270"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<int key="IBUITag">2</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+								<object class="NSCustomResource" key="IBUIImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">background_alt.png</string>
+								</object>
+							</object>
 							<object class="IBUIButton" id="257730270">
 								<reference key="NSNextResponder" ref="811328787"/>
 								<int key="NSvFlags">292</int>
@@ -200,7 +273,7 @@
 									<int key="traits">2</int>
 									<double key="pointSize">15</double>
 								</object>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="579980565">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -227,7 +300,7 @@
 									<string key="NSResourceName">numpad_two_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="534491605">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -254,7 +327,7 @@
 									<string key="NSResourceName">numpad_three_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="405606838">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -281,7 +354,7 @@
 									<string key="NSResourceName">numpad_four_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="984444210">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -308,7 +381,7 @@
 									<string key="NSResourceName">numpad_five_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="505513327">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -335,7 +408,7 @@
 									<string key="NSResourceName">numpad_six_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="829692929">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -362,7 +435,7 @@
 									<string key="NSResourceName">numpad_seven_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="430965229">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -389,7 +462,7 @@
 									<string key="NSResourceName">numpad_eight_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="565116665">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -416,7 +489,7 @@
 									<string key="NSResourceName">numpad_nine_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="47810246">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -443,7 +516,7 @@
 									<string key="NSResourceName">numpad_star_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="776264615">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -470,7 +543,7 @@
 									<string key="NSResourceName">numpad_zero_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="718499319">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -497,18 +570,15 @@
 									<string key="NSResourceName">numpad_sharp_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 						</array>
 						<string key="NSFrame">{{0, 640}, {320, 260}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="257730270"/>
+						<reference key="NSNextKeyView" ref="848268216"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor" id="474273757">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MCAwAA</bytes>
-						</object>
+						<reference key="IBUIBackgroundColor" ref="474273757"/>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 					</object>
 					<object class="IBUIView" id="683359487">
@@ -547,7 +617,7 @@
 									<string key="NSResourceName">add_contact_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="405746031">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -580,7 +650,7 @@
 									<string key="NSResourceName">back_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="981547916">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -614,7 +684,7 @@
 									<string key="NSResourceName">call_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="514058756">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -648,7 +718,7 @@
 									<string key="NSResourceName">add_call_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="1043651254">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -656,7 +726,6 @@
 								<string key="NSFrame">{{126, 0}, {186, 85}}</string>
 								<reference key="NSSuperview" ref="683359487"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -682,7 +751,7 @@
 									<string key="NSResourceName">transfer_call_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 						</array>
 						<string key="NSFrame">{{456, 815}, {312, 85}}</string>
@@ -701,7 +770,7 @@
 				<string key="NSFrameSize">{768, 900}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="935083036"/>
+				<reference key="NSNextKeyView" ref="887694290"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="474273757"/>
 				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -869,6 +938,22 @@
 					</object>
 					<int key="connectionID">69</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">videoCameraSwitch</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="857979271"/>
+					</object>
+					<int key="connectionID">74</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">videoPreview</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="820868226"/>
+					</object>
+					<int key="connectionID">75</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">onAddressChange:</string>
@@ -1024,6 +1109,14 @@
 					</object>
 					<int key="connectionID">39</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">preview</string>
+						<reference key="source" ref="857979271"/>
+						<reference key="destination" ref="820868226"/>
+					</object>
+					<int key="connectionID">72</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -1051,6 +1144,9 @@
 							<reference ref="811328787"/>
 							<reference ref="683359487"/>
 							<reference ref="935083036"/>
+							<reference ref="820868226"/>
+							<reference ref="857979271"/>
+							<reference ref="887694290"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -1083,6 +1179,7 @@
 							<reference ref="534491605"/>
 							<reference ref="579980565"/>
 							<reference ref="257730270"/>
+							<reference ref="848268216"/>
 						</array>
 						<reference key="parent" ref="450916897"/>
 						<string key="objectName">pad</string>
@@ -1218,6 +1315,29 @@
 						<reference key="parent" ref="935083036"/>
 						<string key="objectName">backspaceButton</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">70</int>
+						<reference key="object" ref="820868226"/>
+						<reference key="parent" ref="450916897"/>
+						<string key="objectName">preview</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">71</int>
+						<reference key="object" ref="857979271"/>
+						<reference key="parent" ref="450916897"/>
+						<string key="objectName">videoCameraSwitch</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">73</int>
+						<reference key="object" ref="848268216"/>
+						<reference key="parent" ref="811328787"/>
+						<string key="objectName">background</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">76</int>
+						<reference key="object" ref="887694290"/>
+						<reference key="parent" ref="450916897"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1279,6 +1399,12 @@
 				<string key="6.CustomClassName">UIAddressTextField</string>
 				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="70.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="71.CustomClassName">UICamSwitch</string>
+				<string key="71.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="1" key="71.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="76.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.CustomClassName">UIDigitButton</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="8.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
@@ -1290,7 +1416,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">69</int>
+			<int key="maxID">76</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1335,6 +1461,8 @@
 						<string key="threeButton">UIDigitButton</string>
 						<string key="transferButton">UITransferButton</string>
 						<string key="twoButton">UIDigitButton</string>
+						<string key="videoCameraSwitch">UICamSwitch</string>
+						<string key="videoPreview">UIView</string>
 						<string key="zeroButton">UIDigitButton</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -1410,6 +1538,14 @@
 							<string key="name">twoButton</string>
 							<string key="candidateClassName">UIDigitButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="videoCameraSwitch">
+							<string key="name">videoCameraSwitch</string>
+							<string key="candidateClassName">UICamSwitch</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="videoPreview">
+							<string key="name">videoPreview</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="zeroButton">
 							<string key="name">zeroButton</string>
 							<string key="candidateClassName">UIDigitButton</string>
@@ -1447,6 +1583,25 @@
 						<string key="minorKey">./Classes/UICallButton.h</string>
 					</object>
 				</object>
+				<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">UIDigitButton</string>
 					<string key="superclassName">UILongTouchButton</string>
@@ -1532,6 +1687,7 @@
 			<string key="back_default~ipad.png">{251, 170}</string>
 			<string key="back_disabled~ipad.png">{251, 170}</string>
 			<string key="back_over~ipad.png">{251, 170}</string>
+			<string key="background_alt.png">{640, 561}</string>
 			<string key="backspace_default~ipad.png">{81, 43}</string>
 			<string key="backspace_disabled~ipad.png">{81, 43}</string>
 			<string key="backspace_over~ipad.png">{81, 43}</string>
@@ -1563,6 +1719,8 @@
 			<string key="numpad_two_over.png">{220, 113}</string>
 			<string key="numpad_zero_default.png">{220, 113}</string>
 			<string key="numpad_zero_over.png">{220, 113}</string>
+			<string key="switch_camera_default.png">{170, 65}</string>
+			<string key="switch_camera_over.png">{170, 65}</string>
 			<string key="transfer_call_default~ipad.png">{371, 170}</string>
 			<string key="transfer_call_disabled~ipad.png">{371, 170}</string>
 			<string key="transfer_call_over~ipad.png">{371, 170}</string>
diff --git a/Classes/fr.lproj/DialerViewController~ipad.xib b/Classes/fr.lproj/DialerViewController~ipad.xib
index b9b6c98fd..58f381dce 100644
--- a/Classes/fr.lproj/DialerViewController~ipad.xib
+++ b/Classes/fr.lproj/DialerViewController~ipad.xib
@@ -37,6 +37,70 @@
 				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
+					<object class="IBUIView" id="887694290">
+						<reference key="NSNextResponder" ref="450916897"/>
+						<int key="NSvFlags">301</int>
+						<string key="NSFrame">{{-1000, -1000}, {2768, 2900}}</string>
+						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSNextKeyView" ref="935083036"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<object class="NSColor" key="IBUIBackgroundColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MAA</bytes>
+						</object>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+					</object>
+					<object class="IBUIView" id="820868226">
+						<reference key="NSNextResponder" ref="450916897"/>
+						<int key="NSvFlags">274</int>
+						<string key="NSFrame">{{0, 58}, {768, 842}}</string>
+						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSNextKeyView" ref="857979271"/>
+						<object class="NSColor" key="IBUIBackgroundColor" id="474273757">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MCAwAA</bytes>
+						</object>
+						<int key="IBUIContentMode">1</int>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+					</object>
+					<object class="IBUIButton" id="857979271">
+						<reference key="NSNextResponder" ref="450916897"/>
+						<int key="NSvFlags">-2147483356</int>
+						<string key="NSFrame">{{0, 77}, {85, 33}}</string>
+						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSNextKeyView" ref="811328787"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+							<string key="IBUIAccessibilityLabel">Changer de camera</string>
+						</object>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
+						<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
+						<object class="NSColor" key="IBUINormalTitleShadowColor" id="213950483">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MC41AA</bytes>
+						</object>
+						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">switch_camera_over.png</string>
+						</object>
+						<object class="NSCustomResource" key="IBUINormalBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">switch_camera_default.png</string>
+						</object>
+						<object class="IBUIFontDescription" key="IBUIFontDescription" id="551176679">
+							<int key="type">2</int>
+							<double key="pointSize">15</double>
+						</object>
+						<object class="NSFont" key="IBUIFont" id="733629239">
+							<string key="NSName">Helvetica-Bold</string>
+							<double key="NSSize">15</double>
+							<int key="NSfFlags">16</int>
+						</object>
+					</object>
 					<object class="IBUIView" id="935083036">
 						<reference key="NSNextResponder" ref="450916897"/>
 						<int key="NSvFlags">290</int>
@@ -101,7 +165,7 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{698, 4}, {70, 51}}</string>
 								<reference key="NSSuperview" ref="935083036"/>
-								<reference key="NSNextKeyView" ref="811328787"/>
+								<reference key="NSNextKeyView" ref="820868226"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -117,10 +181,7 @@
 								<double key="IBUIContentEdgeInsets.bottom">15</double>
 								<double key="IBUIContentEdgeInsets.left">15</double>
 								<double key="IBUIContentEdgeInsets.right">15</double>
-								<object class="NSColor" key="IBUINormalTitleShadowColor" id="213950483">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC41AA</bytes>
-								</object>
+								<reference key="IBUINormalTitleShadowColor" ref="213950483"/>
 								<object class="NSCustomResource" key="IBUIHighlightedImage">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">backspace_over~ipad.png</string>
@@ -133,15 +194,8 @@
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">backspace_default~ipad.png</string>
 								</object>
-								<object class="IBUIFontDescription" key="IBUIFontDescription" id="551176679">
-									<int key="type">2</int>
-									<double key="pointSize">15</double>
-								</object>
-								<object class="NSFont" key="IBUIFont" id="914591064">
-									<string key="NSName">Helvetica-Bold</string>
-									<double key="NSSize">15</double>
-									<int key="NSfFlags">16</int>
-								</object>
+								<reference key="IBUIFontDescription" ref="551176679"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 						</array>
 						<string key="NSFrameSize">{768, 80}</string>
@@ -162,6 +216,21 @@
 						<reference key="NSNextResponder" ref="450916897"/>
 						<int key="NSvFlags">268</int>
 						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="848268216">
+								<reference key="NSNextResponder" ref="811328787"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{320, 280}</string>
+								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSNextKeyView" ref="257730270"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<int key="IBUITag">2</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+								<object class="NSCustomResource" key="IBUIImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">background_alt.png</string>
+								</object>
+							</object>
 							<object class="IBUIButton" id="257730270">
 								<reference key="NSNextResponder" ref="811328787"/>
 								<int key="NSvFlags">292</int>
@@ -195,7 +264,7 @@
 									<int key="traits">2</int>
 									<double key="pointSize">15</double>
 								</object>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="579980565">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -221,7 +290,7 @@
 									<string key="NSResourceName">numpad_two_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="534491605">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -247,7 +316,7 @@
 									<string key="NSResourceName">numpad_three_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="405606838">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -273,7 +342,7 @@
 									<string key="NSResourceName">numpad_four_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="984444210">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -299,7 +368,7 @@
 									<string key="NSResourceName">numpad_five_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="505513327">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -325,7 +394,7 @@
 									<string key="NSResourceName">numpad_six_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="829692929">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -351,7 +420,7 @@
 									<string key="NSResourceName">numpad_seven_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="430965229">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -377,7 +446,7 @@
 									<string key="NSResourceName">numpad_eight_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="565116665">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -403,7 +472,7 @@
 									<string key="NSResourceName">numpad_nine_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="47810246">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -429,7 +498,7 @@
 									<string key="NSResourceName">numpad_star_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="776264615">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -455,7 +524,7 @@
 									<string key="NSResourceName">numpad_zero_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="718499319">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -481,17 +550,14 @@
 									<string key="NSResourceName">numpad_sharp_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 						</array>
 						<string key="NSFrame">{{0, 640}, {320, 260}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSNextKeyView" ref="257730270"/>
+						<reference key="NSNextKeyView" ref="848268216"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor" id="474273757">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MCAwAA</bytes>
-						</object>
+						<reference key="IBUIBackgroundColor" ref="474273757"/>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 					</object>
 					<object class="IBUIView" id="683359487">
@@ -529,7 +595,7 @@
 									<string key="NSResourceName">add_contact_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="405746031">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -561,7 +627,7 @@
 									<string key="NSResourceName">back_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="981547916">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -594,7 +660,7 @@
 									<string key="NSResourceName">call_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="514058756">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -627,7 +693,7 @@
 									<string key="NSResourceName">add_call_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="1043651254">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -659,7 +725,7 @@
 									<string key="NSResourceName">transfer_call_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 						</array>
 						<string key="NSFrame">{{456, 815}, {312, 85}}</string>
@@ -675,7 +741,7 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{768, 900}</string>
-				<reference key="NSNextKeyView" ref="935083036"/>
+				<reference key="NSNextKeyView" ref="887694290"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="474273757"/>
 				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -843,6 +909,22 @@
 					</object>
 					<int key="connectionID">69</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">videoCameraSwitch</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="857979271"/>
+					</object>
+					<int key="connectionID">74</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">videoPreview</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="820868226"/>
+					</object>
+					<int key="connectionID">75</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">onAddressChange:</string>
@@ -998,6 +1080,14 @@
 					</object>
 					<int key="connectionID">39</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">preview</string>
+						<reference key="source" ref="857979271"/>
+						<reference key="destination" ref="820868226"/>
+					</object>
+					<int key="connectionID">72</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -1025,6 +1115,9 @@
 							<reference ref="811328787"/>
 							<reference ref="683359487"/>
 							<reference ref="935083036"/>
+							<reference ref="820868226"/>
+							<reference ref="857979271"/>
+							<reference ref="887694290"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -1057,6 +1150,7 @@
 							<reference ref="534491605"/>
 							<reference ref="579980565"/>
 							<reference ref="257730270"/>
+							<reference ref="848268216"/>
 						</array>
 						<reference key="parent" ref="450916897"/>
 						<string key="objectName">pad</string>
@@ -1192,6 +1286,29 @@
 						<reference key="parent" ref="935083036"/>
 						<string key="objectName">backspaceButton</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">70</int>
+						<reference key="object" ref="820868226"/>
+						<reference key="parent" ref="450916897"/>
+						<string key="objectName">preview</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">71</int>
+						<reference key="object" ref="857979271"/>
+						<reference key="parent" ref="450916897"/>
+						<string key="objectName">videoCameraSwitch</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">73</int>
+						<reference key="object" ref="848268216"/>
+						<reference key="parent" ref="811328787"/>
+						<string key="objectName">background</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">76</int>
+						<reference key="object" ref="887694290"/>
+						<reference key="parent" ref="450916897"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1253,6 +1370,12 @@
 				<string key="6.CustomClassName">UIAddressTextField</string>
 				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="70.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="71.CustomClassName">UICamSwitch</string>
+				<string key="71.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="1" key="71.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="76.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.CustomClassName">UIDigitButton</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="8.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
@@ -1264,7 +1387,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">69</int>
+			<int key="maxID">76</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1309,6 +1432,8 @@
 						<string key="threeButton">UIDigitButton</string>
 						<string key="transferButton">UITransferButton</string>
 						<string key="twoButton">UIDigitButton</string>
+						<string key="videoCameraSwitch">UICamSwitch</string>
+						<string key="videoPreview">UIView</string>
 						<string key="zeroButton">UIDigitButton</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -1384,6 +1509,14 @@
 							<string key="name">twoButton</string>
 							<string key="candidateClassName">UIDigitButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="videoCameraSwitch">
+							<string key="name">videoCameraSwitch</string>
+							<string key="candidateClassName">UICamSwitch</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="videoPreview">
+							<string key="name">videoPreview</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="zeroButton">
 							<string key="name">zeroButton</string>
 							<string key="candidateClassName">UIDigitButton</string>
@@ -1421,6 +1554,25 @@
 						<string key="minorKey">./Classes/UICallButton.h</string>
 					</object>
 				</object>
+				<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">UIDigitButton</string>
 					<string key="superclassName">UILongTouchButton</string>
@@ -1506,6 +1658,7 @@
 			<string key="back_default~ipad.png">{251, 170}</string>
 			<string key="back_disabled~ipad.png">{251, 170}</string>
 			<string key="back_over~ipad.png">{251, 170}</string>
+			<string key="background_alt.png">{640, 561}</string>
 			<string key="backspace_default~ipad.png">{81, 43}</string>
 			<string key="backspace_disabled~ipad.png">{81, 43}</string>
 			<string key="backspace_over~ipad.png">{81, 43}</string>
@@ -1537,6 +1690,8 @@
 			<string key="numpad_two_over.png">{220, 113}</string>
 			<string key="numpad_zero_default.png">{220, 113}</string>
 			<string key="numpad_zero_over.png">{220, 113}</string>
+			<string key="switch_camera_default.png">{170, 65}</string>
+			<string key="switch_camera_over.png">{170, 65}</string>
 			<string key="transfer_call_default~ipad.png">{371, 170}</string>
 			<string key="transfer_call_disabled~ipad.png">{371, 170}</string>
 			<string key="transfer_call_over~ipad.png">{371, 170}</string>
diff --git a/Resources/background_alt.png b/Resources/background_alt.png
new file mode 100644
index 000000000..3e178844a
Binary files /dev/null and b/Resources/background_alt.png differ
diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist
index 70072ae50..3e1f5e832 100644
--- a/linphone.ldb/Contents.plist
+++ b/linphone.ldb/Contents.plist
@@ -1285,17 +1285,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>2</key>
+							<key>3</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>Classes/DialerViewController~ipad/2/DialerViewController~ipad.xib</string>
+								<string>Classes/DialerViewController~ipad/3/DialerViewController~ipad.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-11T07:20:16Z</date>
+					<date>2012-09-14T08:21:20Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -1305,7 +1305,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>fc4e4cbece826acf96d8cbb7d692bf2f
+					<string>199b213a86204679336e2f627d919b3d
 </string>
 					<key>name</key>
 					<string>DialerViewController~ipad.xib</string>
@@ -1811,6 +1811,31 @@
 							<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 = "IBUIButton"; accessibilityLabel = "Switch camera"; ObjectID = "71";</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>71.accessibilityLabel</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Switch camera</string>
+								<key>fr</key>
+								<string>Changer de camera</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
 					</array>
 					<key>old objects</key>
 					<array/>
@@ -1819,9 +1844,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>2</string>
+						<string>3</string>
 						<key>fr</key>
-						<string>2</string>
+						<string>3</string>
 					</dict>
 				</dict>
 				<dict>
diff --git a/linphone.ldb/Resources/Classes/DialerViewController~ipad/2/DialerViewController~ipad.xib b/linphone.ldb/Resources/Classes/DialerViewController~ipad/3/DialerViewController~ipad.xib
similarity index 89%
rename from linphone.ldb/Resources/Classes/DialerViewController~ipad/2/DialerViewController~ipad.xib
rename to linphone.ldb/Resources/Classes/DialerViewController~ipad/3/DialerViewController~ipad.xib
index c4844b21a..26bc622af 100644
--- a/linphone.ldb/Resources/Classes/DialerViewController~ipad/2/DialerViewController~ipad.xib
+++ b/linphone.ldb/Resources/Classes/DialerViewController~ipad/3/DialerViewController~ipad.xib
@@ -37,6 +37,73 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
+					<object class="IBUIView" id="887694290">
+						<reference key="NSNextResponder" ref="450916897"/>
+						<int key="NSvFlags">301</int>
+						<string key="NSFrame">{{-1000, -1000}, {2768, 2900}}</string>
+						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="935083036"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<object class="NSColor" key="IBUIBackgroundColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MAA</bytes>
+						</object>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+					</object>
+					<object class="IBUIView" id="820868226">
+						<reference key="NSNextResponder" ref="450916897"/>
+						<int key="NSvFlags">274</int>
+						<string key="NSFrame">{{0, 58}, {768, 842}}</string>
+						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="857979271"/>
+						<object class="NSColor" key="IBUIBackgroundColor" id="474273757">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MCAwAA</bytes>
+						</object>
+						<int key="IBUIContentMode">1</int>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+					</object>
+					<object class="IBUIButton" id="857979271">
+						<reference key="NSNextResponder" ref="450916897"/>
+						<int key="NSvFlags">-2147483356</int>
+						<string key="NSFrame">{{0, 77}, {85, 33}}</string>
+						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="811328787"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+							<string key="IBUIAccessibilityLabel">Switch camera</string>
+						</object>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
+						<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
+						<object class="NSColor" key="IBUINormalTitleShadowColor" id="213950483">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MC41AA</bytes>
+						</object>
+						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">switch_camera_over.png</string>
+						</object>
+						<object class="NSCustomResource" key="IBUINormalBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">switch_camera_default.png</string>
+						</object>
+						<object class="IBUIFontDescription" key="IBUIFontDescription" id="551176679">
+							<int key="type">2</int>
+							<double key="pointSize">15</double>
+						</object>
+						<object class="NSFont" key="IBUIFont" id="733629239">
+							<string key="NSName">Helvetica-Bold</string>
+							<double key="NSSize">15</double>
+							<int key="NSfFlags">16</int>
+						</object>
+					</object>
 					<object class="IBUIView" id="935083036">
 						<reference key="NSNextResponder" ref="450916897"/>
 						<int key="NSvFlags">290</int>
@@ -104,7 +171,7 @@
 								<string key="NSFrame">{{698, 4}, {70, 51}}</string>
 								<reference key="NSSuperview" ref="935083036"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="811328787"/>
+								<reference key="NSNextKeyView" ref="820868226"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -120,10 +187,7 @@
 								<double key="IBUIContentEdgeInsets.bottom">15</double>
 								<double key="IBUIContentEdgeInsets.left">15</double>
 								<double key="IBUIContentEdgeInsets.right">15</double>
-								<object class="NSColor" key="IBUINormalTitleShadowColor" id="213950483">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC41AA</bytes>
-								</object>
+								<reference key="IBUINormalTitleShadowColor" ref="213950483"/>
 								<object class="NSCustomResource" key="IBUIHighlightedImage">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">backspace_over~ipad.png</string>
@@ -136,15 +200,8 @@
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">backspace_default~ipad.png</string>
 								</object>
-								<object class="IBUIFontDescription" key="IBUIFontDescription" id="551176679">
-									<int key="type">2</int>
-									<double key="pointSize">15</double>
-								</object>
-								<object class="NSFont" key="IBUIFont" id="914591064">
-									<string key="NSName">Helvetica-Bold</string>
-									<double key="NSSize">15</double>
-									<int key="NSfFlags">16</int>
-								</object>
+								<reference key="IBUIFontDescription" ref="551176679"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 						</array>
 						<string key="NSFrameSize">{768, 80}</string>
@@ -166,6 +223,22 @@
 						<reference key="NSNextResponder" ref="450916897"/>
 						<int key="NSvFlags">268</int>
 						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="848268216">
+								<reference key="NSNextResponder" ref="811328787"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{320, 280}</string>
+								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="257730270"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<int key="IBUITag">2</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+								<object class="NSCustomResource" key="IBUIImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">background_alt.png</string>
+								</object>
+							</object>
 							<object class="IBUIButton" id="257730270">
 								<reference key="NSNextResponder" ref="811328787"/>
 								<int key="NSvFlags">292</int>
@@ -200,7 +273,7 @@
 									<int key="traits">2</int>
 									<double key="pointSize">15</double>
 								</object>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="579980565">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -227,7 +300,7 @@
 									<string key="NSResourceName">numpad_two_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="534491605">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -254,7 +327,7 @@
 									<string key="NSResourceName">numpad_three_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="405606838">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -281,7 +354,7 @@
 									<string key="NSResourceName">numpad_four_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="984444210">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -308,7 +381,7 @@
 									<string key="NSResourceName">numpad_five_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="505513327">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -335,7 +408,7 @@
 									<string key="NSResourceName">numpad_six_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="829692929">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -362,7 +435,7 @@
 									<string key="NSResourceName">numpad_seven_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="430965229">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -389,7 +462,7 @@
 									<string key="NSResourceName">numpad_eight_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="565116665">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -416,7 +489,7 @@
 									<string key="NSResourceName">numpad_nine_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="47810246">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -443,7 +516,7 @@
 									<string key="NSResourceName">numpad_star_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="776264615">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -470,7 +543,7 @@
 									<string key="NSResourceName">numpad_zero_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="718499319">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -497,18 +570,15 @@
 									<string key="NSResourceName">numpad_sharp_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 						</array>
 						<string key="NSFrame">{{0, 640}, {320, 260}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="257730270"/>
+						<reference key="NSNextKeyView" ref="848268216"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor" id="474273757">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MCAwAA</bytes>
-						</object>
+						<reference key="IBUIBackgroundColor" ref="474273757"/>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 					</object>
 					<object class="IBUIView" id="683359487">
@@ -547,7 +617,7 @@
 									<string key="NSResourceName">add_contact_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="405746031">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -580,7 +650,7 @@
 									<string key="NSResourceName">back_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="981547916">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -614,7 +684,7 @@
 									<string key="NSResourceName">call_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="514058756">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -648,7 +718,7 @@
 									<string key="NSResourceName">add_call_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="1043651254">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -656,7 +726,6 @@
 								<string key="NSFrame">{{126, 0}, {186, 85}}</string>
 								<reference key="NSSuperview" ref="683359487"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -682,7 +751,7 @@
 									<string key="NSResourceName">transfer_call_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 						</array>
 						<string key="NSFrame">{{456, 815}, {312, 85}}</string>
@@ -701,7 +770,7 @@
 				<string key="NSFrameSize">{768, 900}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="935083036"/>
+				<reference key="NSNextKeyView" ref="887694290"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="474273757"/>
 				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -869,6 +938,22 @@
 					</object>
 					<int key="connectionID">69</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">videoCameraSwitch</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="857979271"/>
+					</object>
+					<int key="connectionID">74</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">videoPreview</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="820868226"/>
+					</object>
+					<int key="connectionID">75</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">onAddressChange:</string>
@@ -1024,6 +1109,14 @@
 					</object>
 					<int key="connectionID">39</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">preview</string>
+						<reference key="source" ref="857979271"/>
+						<reference key="destination" ref="820868226"/>
+					</object>
+					<int key="connectionID">72</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -1051,6 +1144,9 @@
 							<reference ref="811328787"/>
 							<reference ref="683359487"/>
 							<reference ref="935083036"/>
+							<reference ref="820868226"/>
+							<reference ref="857979271"/>
+							<reference ref="887694290"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -1083,6 +1179,7 @@
 							<reference ref="534491605"/>
 							<reference ref="579980565"/>
 							<reference ref="257730270"/>
+							<reference ref="848268216"/>
 						</array>
 						<reference key="parent" ref="450916897"/>
 						<string key="objectName">pad</string>
@@ -1218,6 +1315,29 @@
 						<reference key="parent" ref="935083036"/>
 						<string key="objectName">backspaceButton</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">70</int>
+						<reference key="object" ref="820868226"/>
+						<reference key="parent" ref="450916897"/>
+						<string key="objectName">preview</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">71</int>
+						<reference key="object" ref="857979271"/>
+						<reference key="parent" ref="450916897"/>
+						<string key="objectName">videoCameraSwitch</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">73</int>
+						<reference key="object" ref="848268216"/>
+						<reference key="parent" ref="811328787"/>
+						<string key="objectName">background</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">76</int>
+						<reference key="object" ref="887694290"/>
+						<reference key="parent" ref="450916897"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1279,6 +1399,12 @@
 				<string key="6.CustomClassName">UIAddressTextField</string>
 				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="70.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="71.CustomClassName">UICamSwitch</string>
+				<string key="71.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="1" key="71.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="76.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.CustomClassName">UIDigitButton</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="8.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
@@ -1290,7 +1416,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">69</int>
+			<int key="maxID">76</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1335,6 +1461,8 @@
 						<string key="threeButton">UIDigitButton</string>
 						<string key="transferButton">UITransferButton</string>
 						<string key="twoButton">UIDigitButton</string>
+						<string key="videoCameraSwitch">UICamSwitch</string>
+						<string key="videoPreview">UIView</string>
 						<string key="zeroButton">UIDigitButton</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -1410,6 +1538,14 @@
 							<string key="name">twoButton</string>
 							<string key="candidateClassName">UIDigitButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="videoCameraSwitch">
+							<string key="name">videoCameraSwitch</string>
+							<string key="candidateClassName">UICamSwitch</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="videoPreview">
+							<string key="name">videoPreview</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="zeroButton">
 							<string key="name">zeroButton</string>
 							<string key="candidateClassName">UIDigitButton</string>
@@ -1447,6 +1583,25 @@
 						<string key="minorKey">./Classes/UICallButton.h</string>
 					</object>
 				</object>
+				<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">UIDigitButton</string>
 					<string key="superclassName">UILongTouchButton</string>
@@ -1532,6 +1687,7 @@
 			<string key="back_default~ipad.png">{251, 170}</string>
 			<string key="back_disabled~ipad.png">{251, 170}</string>
 			<string key="back_over~ipad.png">{251, 170}</string>
+			<string key="background_alt.png">{640, 561}</string>
 			<string key="backspace_default~ipad.png">{81, 43}</string>
 			<string key="backspace_disabled~ipad.png">{81, 43}</string>
 			<string key="backspace_over~ipad.png">{81, 43}</string>
@@ -1563,6 +1719,8 @@
 			<string key="numpad_two_over.png">{220, 113}</string>
 			<string key="numpad_zero_default.png">{220, 113}</string>
 			<string key="numpad_zero_over.png">{220, 113}</string>
+			<string key="switch_camera_default.png">{170, 65}</string>
+			<string key="switch_camera_over.png">{170, 65}</string>
 			<string key="transfer_call_default~ipad.png">{371, 170}</string>
 			<string key="transfer_call_disabled~ipad.png">{371, 170}</string>
 			<string key="transfer_call_over~ipad.png">{371, 170}</string>
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 60e1d94c3..224701b1c 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -778,6 +778,8 @@
 		D389363B15A6D53200A3A3AA /* chat_bubble_outgoing.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D389363815A6D53200A3A3AA /* chat_bubble_outgoing.9.png */; };
 		D38D14AF15A30B3D008497E8 /* cell_call_first_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D38D14AD15A30B3D008497E8 /* cell_call_first_highlight.png */; };
 		D38D14B115A30B3D008497E8 /* cell_call_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D38D14AE15A30B3D008497E8 /* cell_call_highlight.png */; };
+		D3998D0416031937009DD22C /* background_alt.png in Resources */ = {isa = PBXBuildFile; fileRef = D3998D0316031937009DD22C /* background_alt.png */; };
+		D3998D0516031937009DD22C /* background_alt.png in Resources */ = {isa = PBXBuildFile; fileRef = D3998D0316031937009DD22C /* background_alt.png */; };
 		D3A55FBC15877E5E003FD403 /* UIContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* UIContactCell.m */; };
 		D3A55FBD15877E5E003FD403 /* UIContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* UIContactCell.m */; };
 		D3A55FBF15877E69003FD403 /* UIContactCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3A55FBE15877E69003FD403 /* UIContactCell.xib */; };
@@ -1807,6 +1809,7 @@
 		D389363815A6D53200A3A3AA /* chat_bubble_outgoing.9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_bubble_outgoing.9.png; path = Resources/chat_bubble_outgoing.9.png; sourceTree = "<group>"; };
 		D38D14AD15A30B3D008497E8 /* cell_call_first_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cell_call_first_highlight.png; path = Resources/cell_call_first_highlight.png; sourceTree = "<group>"; };
 		D38D14AE15A30B3D008497E8 /* cell_call_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cell_call_highlight.png; path = Resources/cell_call_highlight.png; sourceTree = "<group>"; };
+		D3998D0316031937009DD22C /* background_alt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = background_alt.png; path = Resources/background_alt.png; sourceTree = "<group>"; };
 		D3A55FBA15877E5E003FD403 /* UIContactCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIContactCell.h; sourceTree = "<group>"; };
 		D3A55FBB15877E5E003FD403 /* UIContactCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIContactCell.m; sourceTree = "<group>"; };
 		D3A55FBE15877E69003FD403 /* UIContactCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UIContactCell.xib; sourceTree = "<group>"; };
@@ -2735,6 +2738,7 @@
 				D3211BBD159CBFD60098460B /* back_over.png */,
 				D3A74E6615C69392001500B9 /* back_over~ipad.png */,
 				D3ED3E401585FB4A006C0DE4 /* background.png */,
+				D3998D0316031937009DD22C /* background_alt.png */,
 				D3A74E6715C69392001500B9 /* background_top~ipad.png */,
 				D3ED3E7615861B1B006C0DE4 /* backspace_default.png */,
 				D3A74E6815C69392001500B9 /* backspace_default~ipad.png */,
@@ -3845,6 +3849,7 @@
 				D381885615FE448400C3EDCA /* UICallBar~ipad.xib in Resources */,
 				D3ED40241602257400BF332B /* chat_background.9.png in Resources */,
 				D3ED40261602257400BF332B /* chat_background.9@2x.png in Resources */,
+				D3998D0416031937009DD22C /* background_alt.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4295,6 +4300,7 @@
 				D381885715FE448400C3EDCA /* UICallBar~ipad.xib in Resources */,
 				D3ED40251602257400BF332B /* chat_background.9.png in Resources */,
 				D3ED40271602257400BF332B /* chat_background.9@2x.png in Resources */,
+				D3998D0516031937009DD22C /* background_alt.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};