diff --git a/Classes/FirstLoginViewController.m b/Classes/FirstLoginViewController.m
index 99bd808c5..ddacf0e09 100644
--- a/Classes/FirstLoginViewController.m
+++ b/Classes/FirstLoginViewController.m
@@ -90,7 +90,6 @@
 	[[NSUserDefaults standardUserDefaults] setBool:false forKey:@"enable_first_login_view_preference"]; 
 	[self.parentViewController dismissModalViewControllerAnimated:true];
 	[self.activityIndicator setHidden:true];
-	[[LinphoneManager instance] setRegistrationDelegate:nil]; 
 }
 -(void) displayRegisteringFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName onDomain:(NSString*)domain {
 	[self.activityIndicator setHidden:false];
diff --git a/Classes/InCallViewController-ipad.xib b/Classes/InCallViewController-ipad.xib
index 592a9208f..17661327c 100644
--- a/Classes/InCallViewController-ipad.xib
+++ b/Classes/InCallViewController-ipad.xib
@@ -43,6 +43,7 @@
 							<int key="NSvFlags">274</int>
 							<string key="NSFrameSize">{768, 805}</string>
 							<reference key="NSSuperview" ref="134115264"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="815826897"/>
 							<string key="NSReuseIdentifierKey">_NS:408</string>
 							<object class="NSColor" key="IBUIBackgroundColor">
@@ -70,6 +71,8 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{0, 1}, {320, 66}}</string>
 									<reference key="NSSuperview" ref="677109388"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView"/>
 									<object class="NSColor" key="IBUIBackgroundColor">
 										<int key="NSColorSpace">1</int>
 										<bytes key="NSRGB">MSAwIDAuMDgyMzIwMjU5MDQgMC4xOAA</bytes>
@@ -114,6 +117,7 @@
 							</array>
 							<string key="NSFrame">{{224, 937}, {320, 77}}</string>
 							<reference key="NSSuperview" ref="134115264"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="1019514465"/>
 							<string key="NSReuseIdentifierKey">_NS:196</string>
 							<object class="NSColor" key="IBUIBackgroundColor" id="379880382">
@@ -131,6 +135,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{107, 70}, {106, 66}}</string>
 									<reference key="NSSuperview" ref="331380355"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="551654695"/>
 									<reference key="IBUIBackgroundColor" ref="379880382"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -144,10 +149,6 @@
 										<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
 									</object>
 									<reference key="IBUINormalTitleShadowColor" ref="275823755"/>
-									<object class="NSCustomResource" key="IBUIDisabledImage">
-										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">conf_merge.png</string>
-									</object>
 									<object class="NSCustomResource" key="IBUINormalImage">
 										<string key="NSClassName">NSImage</string>
 										<string key="NSResourceName">grouper.png</string>
@@ -167,6 +168,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{0, 4}, {107, 66}}</string>
 									<reference key="NSSuperview" ref="331380355"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="884236009"/>
 									<reference key="IBUIBackgroundColor" ref="379880382"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -207,6 +209,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{0, 70}, {107, 66}}</string>
 									<reference key="NSSuperview" ref="331380355"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="694322717"/>
 									<reference key="IBUIBackgroundColor" ref="379880382"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -232,6 +235,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{213, 70}, {107, 66}}</string>
 									<reference key="NSSuperview" ref="331380355"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="43602080"/>
 									<reference key="IBUIBackgroundColor" ref="379880382"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -260,6 +264,7 @@
 									<int key="NSvFlags">-2147483356</int>
 									<string key="NSFrame">{{213, 70}, {107, 66}}</string>
 									<reference key="NSSuperview" ref="331380355"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="677109388"/>
 									<reference key="IBUIBackgroundColor" ref="379880382"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -287,6 +292,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{107, 4}, {106, 66}}</string>
 									<reference key="NSSuperview" ref="331380355"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="1070839124"/>
 									<reference key="IBUIBackgroundColor" ref="379880382"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -312,6 +318,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{213, 4}, {107, 66}}</string>
 									<reference key="NSSuperview" ref="331380355"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="914839389"/>
 									<reference key="IBUIBackgroundColor" ref="379880382"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -342,6 +349,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{107, 70}, {106, 66}}</string>
 									<reference key="NSSuperview" ref="331380355"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="185207809"/>
 									<reference key="IBUIBackgroundColor" ref="379880382"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -371,6 +379,7 @@
 							</array>
 							<string key="NSFrame">{{224, 801.5}, {320, 135}}</string>
 							<reference key="NSSuperview" ref="134115264"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="464527620"/>
 							<reference key="IBUIBackgroundColor" ref="379880382"/>
 							<bool key="IBUIOpaque">NO</bool>
@@ -386,6 +395,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{119, 251}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="815826897"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="331380355"/>
 									<reference key="IBUIBackgroundColor" ref="379880382"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -408,6 +418,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{119, 193}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="815826897"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="778910645"/>
 									<object class="NSColor" key="IBUIBackgroundColor" id="948655818">
 										<int key="NSColorSpace">3</int>
@@ -433,6 +444,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{31, 19}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="815826897"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="274639717"/>
 									<reference key="IBUIBackgroundColor" ref="948655818"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -455,6 +467,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{119, 19}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="815826897"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="167373992"/>
 									<reference key="IBUIBackgroundColor" ref="948655818"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -474,6 +487,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{207, 19}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="815826897"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="9029257"/>
 									<reference key="IBUIBackgroundColor" ref="948655818"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -496,6 +510,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{31, 77}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="815826897"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="46522822"/>
 									<reference key="IBUIBackgroundColor" ref="948655818"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -518,6 +533,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{119, 77}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="815826897"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="767525360"/>
 									<reference key="IBUIBackgroundColor" ref="948655818"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -540,6 +556,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{207, 77}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="815826897"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="686137646"/>
 									<reference key="IBUIBackgroundColor" ref="948655818"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -562,6 +579,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{31, 135}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="815826897"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="693786132"/>
 									<reference key="IBUIBackgroundColor" ref="948655818"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -584,6 +602,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{119, 135}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="815826897"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="713296002"/>
 									<reference key="IBUIBackgroundColor" ref="948655818"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -606,6 +625,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{207, 135}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="815826897"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="1017517001"/>
 									<reference key="IBUIBackgroundColor" ref="948655818"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -628,6 +648,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{31, 193}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="815826897"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="171697004"/>
 									<reference key="IBUIBackgroundColor" ref="948655818"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -650,6 +671,7 @@
 									<int key="NSvFlags">292</int>
 									<string key="NSFrame">{{207, 193}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="815826897"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="19432561"/>
 									<reference key="IBUIBackgroundColor" ref="948655818"/>
 									<bool key="IBUIOpaque">NO</bool>
@@ -670,6 +692,7 @@
 							</array>
 							<string key="NSFrame">{{178, 146}, {320, 310}}</string>
 							<reference key="NSSuperview" ref="134115264"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="855969656"/>
 							<object class="NSColor" key="IBUIBackgroundColor">
 								<int key="NSColorSpace">3</int>
@@ -682,6 +705,7 @@
 					</array>
 					<string key="NSFrame">{{0, 20}, {768, 1004}}</string>
 					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="447519759"/>
 					<string key="NSReuseIdentifierKey">_NS:212</string>
 					<reference key="IBUIBackgroundColor" ref="948655818"/>
@@ -1220,7 +1244,7 @@
 				<string key="90.CustomClassName">UIAddVideoButton</string>
 				<string key="90.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="91.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="0.0" key="91.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<real value="3" key="91.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="92.CustomClassName">UIMuteButton</string>
 				<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="2" key="92.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
@@ -1244,7 +1268,357 @@
 			<nil key="sourceID"/>
 			<int key="maxID">144</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">IncallViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">doAction:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">doAction:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">doAction:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="addCall">UIButton</string>
+						<string key="addVideo">UIButton</string>
+						<string key="callTableView">UITableView</string>
+						<string key="close">UIButton</string>
+						<string key="conferenceDetail">UIViewController</string>
+						<string key="contacts">UIButton</string>
+						<string key="controlSubView">UIView</string>
+						<string key="dialer">UIButton</string>
+						<string key="eight">UIButton</string>
+						<string key="endCtrl">UIButton</string>
+						<string key="five">UIButton</string>
+						<string key="four">UIButton</string>
+						<string key="hangUpView">UIView</string>
+						<string key="hash">UIButton</string>
+						<string key="mergeCalls">UIButton</string>
+						<string key="mute">UIButton</string>
+						<string key="nine">UIButton</string>
+						<string key="one">UIButton</string>
+						<string key="padSubView">UIView</string>
+						<string key="pause">UIButton</string>
+						<string key="seven">UIButton</string>
+						<string key="six">UIButton</string>
+						<string key="speaker">UIButton</string>
+						<string key="star">UIButton</string>
+						<string key="three">UIButton</string>
+						<string key="two">UIButton</string>
+						<string key="videoViewController">VideoViewController</string>
+						<string key="zero">UIButton</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="addCall">
+							<string key="name">addCall</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="addVideo">
+							<string key="name">addVideo</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="callTableView">
+							<string key="name">callTableView</string>
+							<string key="candidateClassName">UITableView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="close">
+							<string key="name">close</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="conferenceDetail">
+							<string key="name">conferenceDetail</string>
+							<string key="candidateClassName">UIViewController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="contacts">
+							<string key="name">contacts</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="controlSubView">
+							<string key="name">controlSubView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="dialer">
+							<string key="name">dialer</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="eight">
+							<string key="name">eight</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="endCtrl">
+							<string key="name">endCtrl</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="five">
+							<string key="name">five</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="four">
+							<string key="name">four</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="hangUpView">
+							<string key="name">hangUpView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="hash">
+							<string key="name">hash</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mergeCalls">
+							<string key="name">mergeCalls</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mute">
+							<string key="name">mute</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="nine">
+							<string key="name">nine</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="one">
+							<string key="name">one</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="padSubView">
+							<string key="name">padSubView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="pause">
+							<string key="name">pause</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="seven">
+							<string key="name">seven</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="six">
+							<string key="name">six</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="speaker">
+							<string key="name">speaker</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="star">
+							<string key="name">star</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="three">
+							<string key="name">three</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="two">
+							<string key="name">two</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="videoViewController">
+							<string key="name">videoViewController</string>
+							<string key="candidateClassName">VideoViewController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="zero">
+							<string key="name">zero</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/IncallViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIAddVideoButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIAddVideoButton.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">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIDigitButton.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">UISpeakerButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UISpeakerButton.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>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="mCallQuality">UIImageView</string>
+						<string key="mCallQualityLandLeft">UIImageView</string>
+						<string key="mCallQualityLandRight">UIImageView</string>
+						<string key="mCamSwitch">UICamSwitch</string>
+						<string key="mCamSwitchLandLeft">UICamSwitch</string>
+						<string key="mCamSwitchLandRight">UICamSwitch</string>
+						<string key="mDisplay">UIView</string>
+						<string key="mDisplayLandLeft">UIView</string>
+						<string key="mDisplayLandRight">UIView</string>
+						<string key="mHangUp">UIHangUpButton</string>
+						<string key="mHangUpLandLeft">UIHangUpButton</string>
+						<string key="mHangUpLandRight">UIHangUpButton</string>
+						<string key="mLandscapeLeft">UIView</string>
+						<string key="mLandscapeRight">UIView</string>
+						<string key="mMute">UIMuteButton</string>
+						<string key="mMuteLandLeft">UIMuteButton</string>
+						<string key="mMuteLandRight">UIMuteButton</string>
+						<string key="mPortrait">UIView</string>
+						<string key="mPreview">UIView</string>
+						<string key="mPreviewLandLeft">UIView</string>
+						<string key="mPreviewLandRight">UIView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="mCallQuality">
+							<string key="name">mCallQuality</string>
+							<string key="candidateClassName">UIImageView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mCallQualityLandLeft">
+							<string key="name">mCallQualityLandLeft</string>
+							<string key="candidateClassName">UIImageView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mCallQualityLandRight">
+							<string key="name">mCallQualityLandRight</string>
+							<string key="candidateClassName">UIImageView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mCamSwitch">
+							<string key="name">mCamSwitch</string>
+							<string key="candidateClassName">UICamSwitch</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mCamSwitchLandLeft">
+							<string key="name">mCamSwitchLandLeft</string>
+							<string key="candidateClassName">UICamSwitch</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mCamSwitchLandRight">
+							<string key="name">mCamSwitchLandRight</string>
+							<string key="candidateClassName">UICamSwitch</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mDisplay">
+							<string key="name">mDisplay</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mDisplayLandLeft">
+							<string key="name">mDisplayLandLeft</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mDisplayLandRight">
+							<string key="name">mDisplayLandRight</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mHangUp">
+							<string key="name">mHangUp</string>
+							<string key="candidateClassName">UIHangUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mHangUpLandLeft">
+							<string key="name">mHangUpLandLeft</string>
+							<string key="candidateClassName">UIHangUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mHangUpLandRight">
+							<string key="name">mHangUpLandRight</string>
+							<string key="candidateClassName">UIHangUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mLandscapeLeft">
+							<string key="name">mLandscapeLeft</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mLandscapeRight">
+							<string key="name">mLandscapeRight</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mMute">
+							<string key="name">mMute</string>
+							<string key="candidateClassName">UIMuteButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mMuteLandLeft">
+							<string key="name">mMuteLandLeft</string>
+							<string key="candidateClassName">UIMuteButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mMuteLandRight">
+							<string key="name">mMuteLandRight</string>
+							<string key="candidateClassName">UIMuteButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mPortrait">
+							<string key="name">mPortrait</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mPreview">
+							<string key="name">mPreview</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mPreviewLandLeft">
+							<string key="name">mPreviewLandLeft</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mPreviewLandRight">
+							<string key="name">mPreviewLandRight</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/VideoViewController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
@@ -1256,10 +1630,9 @@
 			<string key="clavier-01-106px.png">{106, 60}</string>
 			<string key="clavier-01-160px.png">{160, 60}</string>
 			<string key="clavier.png">{106, 67}</string>
-			<string key="conf_merge.png">{16, 16}</string>
 			<string key="contact.png">{107, 67}</string>
 			<string key="grouper.png">{106, 67}</string>
-			<string key="mic_active.png">{82, 82}</string>
+			<string key="mic_active.png">{20, 20}</string>
 			<string key="micro.png">{107, 67}</string>
 			<string key="micro_inverse.png">{107, 67}</string>
 			<string key="pause.png">{106, 67}</string>
diff --git a/Classes/IncallViewController.xib b/Classes/IncallViewController.xib
index 3e1b63885..9a8d85d63 100644
--- a/Classes/IncallViewController.xib
+++ b/Classes/IncallViewController.xib
@@ -150,10 +150,6 @@
 										<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
 									</object>
 									<reference key="IBUINormalTitleShadowColor" ref="785445938"/>
-									<object class="NSCustomResource" key="IBUIDisabledImage">
-										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">conf_merge.png</string>
-									</object>
 									<object class="NSCustomResource" key="IBUINormalImage">
 										<string key="NSClassName">NSImage</string>
 										<string key="NSResourceName">grouper.png</string>
@@ -1284,7 +1280,7 @@
 					<string>UIResponder</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<real value="0.0"/>
+					<real value="3"/>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<real value="0.0"/>
@@ -1376,6 +1372,7 @@
 							<string>callControlSubView</string>
 							<string>callTableView</string>
 							<string>close</string>
+							<string>conferenceDetail</string>
 							<string>contacts</string>
 							<string>controlSubView</string>
 							<string>dialer</string>
@@ -1408,6 +1405,7 @@
 							<string>UIView</string>
 							<string>UITableView</string>
 							<string>UIButton</string>
+							<string>UIViewController</string>
 							<string>UIButton</string>
 							<string>UIView</string>
 							<string>UIButton</string>
@@ -1443,6 +1441,7 @@
 							<string>callControlSubView</string>
 							<string>callTableView</string>
 							<string>close</string>
+							<string>conferenceDetail</string>
 							<string>contacts</string>
 							<string>controlSubView</string>
 							<string>dialer</string>
@@ -1493,6 +1492,10 @@
 								<string key="name">close</string>
 								<string key="candidateClassName">UIButton</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">conferenceDetail</string>
+								<string key="candidateClassName">UIViewController</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">contacts</string>
 								<string key="candidateClassName">UIButton</string>
@@ -1666,30 +1669,60 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>mCallQuality</string>
+							<string>mCallQualityLandLeft</string>
+							<string>mCallQualityLandRight</string>
 							<string>mCamSwitch</string>
 							<string>mCamSwitchLand</string>
+							<string>mCamSwitchLandLeft</string>
+							<string>mCamSwitchLandRight</string>
 							<string>mDisplay</string>
 							<string>mDisplayLand</string>
+							<string>mDisplayLandLeft</string>
+							<string>mDisplayLandRight</string>
 							<string>mHangUp</string>
 							<string>mHangUpLand</string>
+							<string>mHangUpLandLeft</string>
+							<string>mHangUpLandRight</string>
 							<string>mLandscape</string>
+							<string>mLandscapeLeft</string>
+							<string>mLandscapeRight</string>
 							<string>mMute</string>
 							<string>mMuteLand</string>
+							<string>mMuteLandLeft</string>
+							<string>mMuteLandRight</string>
 							<string>mPortrait</string>
 							<string>mPreview</string>
 							<string>mPreviewLand</string>
+							<string>mPreviewLandLeft</string>
+							<string>mPreviewLandRight</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>UIImageView</string>
+							<string>UIImageView</string>
+							<string>UIImageView</string>
+							<string>UICamSwitch</string>
+							<string>UICamSwitch</string>
 							<string>UICamSwitch</string>
 							<string>UICamSwitch</string>
 							<string>UIView</string>
 							<string>UIView</string>
+							<string>UIView</string>
+							<string>UIView</string>
+							<string>UIHangUpButton</string>
+							<string>UIHangUpButton</string>
 							<string>UIHangUpButton</string>
 							<string>UIHangUpButton</string>
 							<string>UIView</string>
+							<string>UIView</string>
+							<string>UIView</string>
 							<string>UIMuteButton</string>
 							<string>UIMuteButton</string>
+							<string>UIMuteButton</string>
+							<string>UIMuteButton</string>
+							<string>UIView</string>
+							<string>UIView</string>
 							<string>UIView</string>
 							<string>UIView</string>
 							<string>UIView</string>
@@ -1699,21 +1732,48 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>mCallQuality</string>
+							<string>mCallQualityLandLeft</string>
+							<string>mCallQualityLandRight</string>
 							<string>mCamSwitch</string>
 							<string>mCamSwitchLand</string>
+							<string>mCamSwitchLandLeft</string>
+							<string>mCamSwitchLandRight</string>
 							<string>mDisplay</string>
 							<string>mDisplayLand</string>
+							<string>mDisplayLandLeft</string>
+							<string>mDisplayLandRight</string>
 							<string>mHangUp</string>
 							<string>mHangUpLand</string>
+							<string>mHangUpLandLeft</string>
+							<string>mHangUpLandRight</string>
 							<string>mLandscape</string>
+							<string>mLandscapeLeft</string>
+							<string>mLandscapeRight</string>
 							<string>mMute</string>
 							<string>mMuteLand</string>
+							<string>mMuteLandLeft</string>
+							<string>mMuteLandRight</string>
 							<string>mPortrait</string>
 							<string>mPreview</string>
 							<string>mPreviewLand</string>
+							<string>mPreviewLandLeft</string>
+							<string>mPreviewLandRight</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">mCallQuality</string>
+								<string key="candidateClassName">UIImageView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">mCallQualityLandLeft</string>
+								<string key="candidateClassName">UIImageView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">mCallQualityLandRight</string>
+								<string key="candidateClassName">UIImageView</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">mCamSwitch</string>
 								<string key="candidateClassName">UICamSwitch</string>
@@ -1722,6 +1782,14 @@
 								<string key="name">mCamSwitchLand</string>
 								<string key="candidateClassName">UICamSwitch</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">mCamSwitchLandLeft</string>
+								<string key="candidateClassName">UICamSwitch</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">mCamSwitchLandRight</string>
+								<string key="candidateClassName">UICamSwitch</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">mDisplay</string>
 								<string key="candidateClassName">UIView</string>
@@ -1730,6 +1798,14 @@
 								<string key="name">mDisplayLand</string>
 								<string key="candidateClassName">UIView</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">mDisplayLandLeft</string>
+								<string key="candidateClassName">UIView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">mDisplayLandRight</string>
+								<string key="candidateClassName">UIView</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">mHangUp</string>
 								<string key="candidateClassName">UIHangUpButton</string>
@@ -1738,10 +1814,26 @@
 								<string key="name">mHangUpLand</string>
 								<string key="candidateClassName">UIHangUpButton</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">mHangUpLandLeft</string>
+								<string key="candidateClassName">UIHangUpButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">mHangUpLandRight</string>
+								<string key="candidateClassName">UIHangUpButton</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">mLandscape</string>
 								<string key="candidateClassName">UIView</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">mLandscapeLeft</string>
+								<string key="candidateClassName">UIView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">mLandscapeRight</string>
+								<string key="candidateClassName">UIView</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">mMute</string>
 								<string key="candidateClassName">UIMuteButton</string>
@@ -1750,6 +1842,14 @@
 								<string key="name">mMuteLand</string>
 								<string key="candidateClassName">UIMuteButton</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">mMuteLandLeft</string>
+								<string key="candidateClassName">UIMuteButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">mMuteLandRight</string>
+								<string key="candidateClassName">UIMuteButton</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">mPortrait</string>
 								<string key="candidateClassName">UIView</string>
@@ -1762,6 +1862,14 @@
 								<string key="name">mPreviewLand</string>
 								<string key="candidateClassName">UIView</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">mPreviewLandLeft</string>
+								<string key="candidateClassName">UIView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">mPreviewLandRight</string>
+								<string key="candidateClassName">UIView</string>
+							</object>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -1793,7 +1901,6 @@
 				<string>clavier-01-106px.png</string>
 				<string>clavier-01-160px.png</string>
 				<string>clavier.png</string>
-				<string>conf_merge.png</string>
 				<string>contact.png</string>
 				<string>grouper.png</string>
 				<string>mic_active.png</string>
@@ -1805,20 +1912,19 @@
 			</object>
 			<object class="NSMutableArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{164, 104}</string>
-				<string>{164, 104}</string>
-				<string>{164, 104}</string>
+				<string>{107, 67}</string>
+				<string>{107, 67}</string>
+				<string>{107, 67}</string>
 				<string>{106, 60}</string>
 				<string>{160, 60}</string>
-				<string>{164, 104}</string>
-				<string>{82, 75}</string>
-				<string>{164, 104}</string>
-				<string>{164, 104}</string>
-				<string>{20, 20}</string>
-				<string>{164, 104}</string>
-				<string>{164, 104}</string>
-				<string>{164, 104}</string>
-				<string>{164, 104}</string>
+				<string>{106, 67}</string>
+				<string>{107, 67}</string>
+				<string>{106, 67}</string>
+				<string>{82, 82}</string>
+				<string>{107, 67}</string>
+				<string>{107, 67}</string>
+				<string>{106, 67}</string>
+				<string>{106, 67}</string>
 				<string>{62, 54}</string>
 			</object>
 		</object>
diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m
index 5408fe6ca..8dcf1e4c3 100644
--- a/Classes/LinphoneUI/LinphoneManager.m
+++ b/Classes/LinphoneUI/LinphoneManager.m
@@ -312,6 +312,8 @@ static void linphone_iphone_call_state(LinphoneCore *lc, LinphoneCall* call, Lin
 }
 
 -(void) onRegister:(LinphoneCore *)lc cfg:(LinphoneProxyConfig*) cfg state:(LinphoneRegistrationState) state message:(const char*) message {
+    NSLog(@"NEW REGISTRATION STATE: '%s' (message: '%s')", linphone_registration_state_to_string(state), message);
+    
 	LinphoneAddress* lAddress = linphone_address_new(linphone_proxy_config_get_identity(cfg));
 	NSString* lUserName = linphone_address_get_username(lAddress)? [[NSString alloc] initWithUTF8String:linphone_address_get_username(lAddress) ]:@"";
 	NSString* lDisplayName = linphone_address_get_display_name(lAddress)? [[NSString alloc] initWithUTF8String:linphone_address_get_display_name(lAddress) ]:@"";
@@ -345,7 +347,6 @@ static void linphone_iphone_call_state(LinphoneCore *lc, LinphoneCall* call, Lin
 												forReason:lErrorMessage];
 		
 		if (lErrorMessage != nil 
-			&& registrationDelegate==nil
 			&& linphone_proxy_config_get_error(cfg) != LinphoneReasonNoResponse) { //do not report network connection issue on registration
 			//default behavior if no registration delegates
 			
diff --git a/Classes/PhoneViewController-ipad.xib b/Classes/PhoneViewController-ipad.xib
index ca23ef6e4..54406ea07 100644
--- a/Classes/PhoneViewController-ipad.xib
+++ b/Classes/PhoneViewController-ipad.xib
@@ -11,7 +11,6 @@
 			<string key="NS.object.0">933</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBUILabel</string>
 			<string>IBUIViewController</string>
 			<string>IBUIButton</string>
 			<string>IBUIView</string>
@@ -158,7 +157,7 @@
 									<string key="NSFrame">{{573, 112.5}, {160, 231}}</string>
 									<reference key="NSSuperview" ref="28417277"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="754042657"/>
+									<reference key="NSNextKeyView" ref="732842198"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -235,39 +234,6 @@
 									<reference key="IBUIFontDescription" ref="478302615"/>
 									<reference key="IBUIFont" ref="1024978874"/>
 								</object>
-								<object class="IBUILabel" id="754042657">
-									<reference key="NSNextResponder" ref="28417277"/>
-									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{415, 346}, {320, 29}}</string>
-									<reference key="NSSuperview" ref="28417277"/>
-									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView"/>
-									<object class="NSColor" key="IBUIBackgroundColor" id="115596650">
-										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MCAwAA</bytes>
-									</object>
-									<bool key="IBUIOpaque">NO</bool>
-									<bool key="IBUIClipsSubviews">YES</bool>
-									<bool key="IBUIUserInteractionEnabled">NO</bool>
-									<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-									<string key="IBUIText">status</string>
-									<object class="NSColor" key="IBUITextColor">
-										<int key="NSColorSpace">1</int>
-										<bytes key="NSRGB">MCAwIDAAA</bytes>
-									</object>
-									<nil key="IBUIHighlightedColor"/>
-									<int key="IBUIBaselineAdjustment">1</int>
-									<float key="IBUIMinimumFontSize">10</float>
-									<object class="IBUIFontDescription" key="IBUIFontDescription">
-										<int key="type">1</int>
-										<double key="pointSize">17</double>
-									</object>
-									<object class="NSFont" key="IBUIFont">
-										<string key="NSName">Helvetica</string>
-										<double key="NSSize">17</double>
-										<int key="NSfFlags">16</int>
-									</object>
-								</object>
 								<object class="IBUIButton" id="512488983">
 									<reference key="NSNextResponder" ref="28417277"/>
 									<int key="NSvFlags">292</int>
@@ -551,6 +517,20 @@
 									<reference key="IBUIFontDescription" ref="478302615"/>
 									<reference key="IBUIFont" ref="1024978874"/>
 								</object>
+								<object class="IBUIView" id="732842198">
+									<reference key="NSNextResponder" ref="28417277"/>
+									<int key="NSvFlags">292</int>
+									<string key="NSFrame">{{415, 351}, {320, 20}}</string>
+									<reference key="NSSuperview" ref="28417277"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView"/>
+									<string key="NSReuseIdentifierKey">_NS:212</string>
+									<object class="NSColor" key="IBUIBackgroundColor" id="115596650">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MCAwAA</bytes>
+									</object>
+									<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+								</object>
 							</array>
 							<string key="NSFrame">{{0, 569}, {768, 386}}</string>
 							<reference key="NSSuperview" ref="403758226"/>
@@ -739,11 +719,11 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">status</string>
+						<string key="label">statusViewHolder</string>
 						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="754042657"/>
+						<reference key="destination" ref="732842198"/>
 					</object>
-					<int key="connectionID">55</int>
+					<int key="connectionID">62</int>
 				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -798,12 +778,12 @@
 							<reference ref="874090106"/>
 							<reference ref="730768748"/>
 							<reference ref="853449854"/>
-							<reference ref="754042657"/>
 							<reference ref="230248043"/>
 							<reference ref="969318046"/>
 							<reference ref="454029686"/>
 							<reference ref="889625182"/>
 							<reference ref="708298572"/>
+							<reference ref="732842198"/>
 						</array>
 						<reference key="parent" ref="403758226"/>
 					</object>
@@ -903,9 +883,10 @@
 						<string key="objectName">Call-large</string>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">21</int>
-						<reference key="object" ref="754042657"/>
+						<int key="objectID">61</int>
+						<reference key="object" ref="732842198"/>
 						<reference key="parent" ref="28417277"/>
+						<string key="objectName">status_holder</string>
 					</object>
 				</array>
 			</object>
@@ -919,7 +900,6 @@
 				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="20.CustomClassName">UICallButton</string>
 				<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="22.CustomClassName">UIEraseButton</string>
 				<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -951,12 +931,13 @@
 				<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="38.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="61.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">60</int>
+			<int key="maxID">62</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -985,17 +966,6 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">PhoneViewController</string>
 					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">doKeyPad:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">doKeyPad:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">doKeyPad:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="address">UITextField</string>
 						<string key="backToCallView">UIButton</string>
@@ -1015,6 +985,7 @@
 						<string key="six">UIButton</string>
 						<string key="star">UIButton</string>
 						<string key="status">UILabel</string>
+						<string key="statusViewHolder">UIView</string>
 						<string key="switchCamera">UIButton</string>
 						<string key="three">UIButton</string>
 						<string key="two">UIButton</string>
@@ -1093,6 +1064,10 @@
 							<string key="name">status</string>
 							<string key="candidateClassName">UILabel</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="statusViewHolder">
+							<string key="name">statusViewHolder</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="switchCamera">
 							<string key="name">switchCamera</string>
 							<string key="candidateClassName">UIButton</string>
diff --git a/Classes/PhoneViewController.h b/Classes/PhoneViewController.h
index 259af213d..27b93562c 100644
--- a/Classes/PhoneViewController.h
+++ b/Classes/PhoneViewController.h
@@ -21,13 +21,14 @@
 #import "linphonecore.h"
 #import "UILinphone.h"
 #import "CallDelegate.h"
+#import "StatusSubViewController.h"
 
 @class MainScreenWithVideoPreview;
 @class IncallViewController;
 @class FirstLoginViewController;
 
 
-@interface PhoneViewController : UIViewController <UITextFieldDelegate,LinphoneUICallDelegate, UIActionSheetCustomDelegate> {
+@interface PhoneViewController : UIViewController <UITextFieldDelegate,LinphoneUICallDelegate, UIActionSheetCustomDelegate, LinphoneUIRegistrationDelegate> {
 
 @private
 	//UI definition
@@ -55,6 +56,7 @@
 	UIDigitButton* hash;
 
 	UIButton* backToCallView;
+    UIView* statusViewHolder;
 	
 	UITabBarController*  myTabBarController;
 
@@ -62,6 +64,7 @@
 	FirstLoginViewController* myFirstLoginViewController;
 	IncallViewController* mIncallViewController;
     MainScreenWithVideoPreview* mMainScreenWithVideoPreview;
+    StatusSubViewController* statusSubViewController;
     
     UIButton* switchCamera;
 }
@@ -87,6 +90,8 @@
 @property (nonatomic, retain) IBOutlet UIButton* zero;
 @property (nonatomic, retain) IBOutlet UIButton* hash;
 
+@property (nonatomic, retain) IBOutlet UIView* statusViewHolder;
+
 @property (nonatomic, retain) IBOutlet UIButton* backToCallView;
 
 @property (nonatomic, retain) IBOutlet UIButton* switchCamera;
diff --git a/Classes/PhoneViewController.m b/Classes/PhoneViewController.m
index a99cfe838..b1f1214a8 100644
--- a/Classes/PhoneViewController.m
+++ b/Classes/PhoneViewController.m
@@ -49,12 +49,54 @@
 @synthesize zero;
 @synthesize hash;
 
+@synthesize statusViewHolder;
+
 @synthesize myTabBarController;
 @synthesize mMainScreenWithVideoPreview;
 @synthesize backToCallView;
 
 @synthesize switchCamera;
 
+-(void) updateStatusSubView {
+    LinphoneCore* lc = 0;
+    @try {
+        lc = [LinphoneManager getLc];
+    } @catch (NSException* exc) {
+        return;
+    }
+    
+    if (!lc)
+        return;
+    
+    BOOL enableCallButtons;
+    LinphoneProxyConfig* config;
+    linphone_core_get_default_proxy([LinphoneManager getLc], &config);
+    
+    LinphoneRegistrationState s;
+    NSString* m = nil;
+    
+    if (config == NULL) {
+        s = LinphoneRegistrationNone;
+        m = @"No SIP account configured";
+    } else {
+        s = linphone_proxy_config_get_state(config);
+    
+        switch (s) {
+            case LinphoneRegistrationOk: m = @"Registered"; break;
+            case LinphoneRegistrationNone: m=@"Not registered"; break;
+            case LinphoneRegistrationFailed: m = @"Registration failed"; break;
+            case LinphoneRegistrationProgress: m = @"Registration in progress"; break;
+            case LinphoneRegistrationCleared: m= @"No SIP account"; break;
+            default: break;
+        }
+    }
+    
+    enableCallButtons = [statusSubViewController updateWithRegistrationState:s message:m];
+    
+    [callLarge setEnabled:enableCallButtons];
+    [callShort setEnabled:enableCallButtons];   
+    [backToCallView setEnabled:enableCallButtons];
+}
 
 -(void) updateCallAndBackButtons {
     @try {
@@ -72,15 +114,18 @@
                    [exc.name cStringUsingEncoding:[NSString defaultCStringEncoding]], 
                    [exc.reason cStringUsingEncoding:[NSString defaultCStringEncoding]]);
     }
+    
+    [self updateStatusSubView];
 }
 
+
 - (void)viewDidAppear:(BOOL)animated {
 	if ([[NSUserDefaults standardUserDefaults] boolForKey:@"enable_first_login_view_preference"] == true) {
 		myFirstLoginViewController = [[FirstLoginViewController alloc]  initWithNibName:@"FirstLoginViewController" 
 																				 bundle:[NSBundle mainBundle]];
-		[[LinphoneManager instance] setRegistrationDelegate:myFirstLoginViewController];
 		[self presentModalViewController:myFirstLoginViewController animated:true];
-	}; 
+	}
+    [[LinphoneManager instance] setRegistrationDelegate:self];
     
     [mMainScreenWithVideoPreview showPreview:YES];
     [self updateCallAndBackButtons];
@@ -91,10 +136,10 @@
 }
 
 
-// Implement viewDidLoad to do additional setup after loading the view, typically from a nib : called twice (?!)
+// Implement viewDidLoad to do additional setup after loading the view, typically from a nib : may be called twice
 - (void)viewDidLoad {
     [super viewDidLoad];
-	
+    
     [mDisplayName release];
 	mDisplayName = [UILabel alloc];
 	[zero initWithNumber:'0'  addressField:address dtmf:false];
@@ -114,8 +159,17 @@
 	[erase initWithAddressField:address];
     [backToCallView addTarget:self action:@selector(backToCallViewPressed) forControlEvents:UIControlEventTouchUpInside];
     
-    mIncallViewController = [[IncallViewController alloc]  initWithNibName:[LinphoneManager runningOnIpad]?@"InCallViewController-ipad":@"IncallViewController" 
+    if (mIncallViewController == nil)
+        mIncallViewController = [[IncallViewController alloc]  initWithNibName:[LinphoneManager runningOnIpad]?@"InCallViewController-ipad":@"IncallViewController" 
 																	bundle:[NSBundle mainBundle]];
+    
+    if (statusSubViewController == nil) {
+        statusSubViewController = [[StatusSubViewController alloc]  initWithNibName:@"StatusSubViewController" 
+                                                                         bundle:[NSBundle mainBundle]];
+        [statusViewHolder addSubview:statusSubViewController.view];
+    }
+    
+    [self updateCallAndBackButtons];
 }
 
 - (void)didReceiveMemoryWarning {
@@ -180,8 +234,7 @@
 }
 
 //status reporting
--(void) displayStatus:(NSString*) message {
-	[status setText:message];
+-(void) displayStatus:(NSString*) message {     
 	[mIncallViewController displayStatus:message];
 }
 
@@ -302,5 +355,31 @@
 	[super dealloc];
 }
 
+-(void) displayRegisteredFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName onDomain:(NSString*)domain {    
+    if (myFirstLoginViewController != nil && self.modalViewController == myFirstLoginViewController) {
+        [myFirstLoginViewController displayRegisteredFromUI:viewCtrl forUser:username withDisplayName:displayName onDomain:domain];
+    }
+    [self updateStatusSubView];
+}
+-(void) displayRegisteringFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName onDomain:(NSString*)domain {
+    if (myFirstLoginViewController != nil && self.modalViewController == myFirstLoginViewController) {
+        [myFirstLoginViewController displayRegisteringFromUI:viewCtrl forUser:username withDisplayName:displayName onDomain:domain];
+    }
+    [self updateStatusSubView];
+}
+-(void) displayRegistrationFailedFromUI:(UIViewController*) viewCtrl forUser:(NSString*) user withDisplayName:(NSString*) displayName onDomain:(NSString*)domain forReason:(NSString*) reason {
+    if (myFirstLoginViewController != nil && self.modalViewController == myFirstLoginViewController) {
+        [myFirstLoginViewController displayRegistrationFailedFromUI:viewCtrl forUser:user withDisplayName:displayName onDomain:domain forReason:reason];
+    }
+    [self updateStatusSubView];
+}
+
+-(void) displayNotRegisteredFromUI:(UIViewController*) viewCtrl { 
+    if (myFirstLoginViewController != nil && self.modalViewController == myFirstLoginViewController) {
+        [myFirstLoginViewController displayNotRegisteredFromUI:viewCtrl];
+    }
+    [self updateStatusSubView];
+}
+
 
 @end
diff --git a/Classes/PhoneViewController.xib b/Classes/PhoneViewController.xib
index ef1171aee..60f3013c1 100644
--- a/Classes/PhoneViewController.xib
+++ b/Classes/PhoneViewController.xib
@@ -12,11 +12,10 @@
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>IBUITextField</string>
 			<string>IBUIViewController</string>
 			<string>IBUIButton</string>
 			<string>IBUIView</string>
-			<string>IBUILabel</string>
+			<string>IBUITextField</string>
 			<string>IBProxyObject</string>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
@@ -51,10 +50,10 @@
 								<object class="IBUIButton" id="366108332">
 									<reference key="NSNextResponder" ref="235890962"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{254, 0}, {66, 65}}</string>
+									<string key="NSFrame">{{254, 0}, {66, 81}}</string>
 									<reference key="NSSuperview" ref="235890962"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="201618948"/>
+									<reference key="NSNextKeyView" ref="1071212265"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 									<int key="IBUIContentHorizontalAlignment">0</int>
@@ -90,10 +89,11 @@
 								<object class="IBUITextField" id="751637181">
 									<reference key="NSNextResponder" ref="235890962"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{5, 0}, {255, 66}}</string>
+									<string key="NSFrame">{{0, 1}, {255, 80}}</string>
 									<reference key="NSSuperview" ref="235890962"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="366108332"/>
+									<reference key="IBUIBackgroundColor" ref="923326808"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -103,9 +103,6 @@
 									<object class="NSColor" key="IBUITextColor">
 										<int key="NSColorSpace">3</int>
 										<bytes key="NSWhite">MAA</bytes>
-										<object class="NSColorSpace" key="NSCustomColorSpace">
-											<int key="NSID">2</int>
-										</object>
 									</object>
 									<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 									<float key="IBUIMinimumFontSize">15</float>
@@ -128,216 +125,31 @@
 									</object>
 								</object>
 							</object>
-							<string key="NSFrameSize">{320, 65}</string>
+							<string key="NSFrameSize">{320, 81}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="751637181"/>
-							<object class="NSColor" key="IBUIBackgroundColor">
-								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MC45MDE5NjA3OSAwLjkwMTk2MDc5IDAuOTAxOTYwNzkAA</bytes>
-							</object>
+							<reference key="IBUIBackgroundColor" ref="923326808"/>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
-						<object class="IBUILabel" id="729745965">
+						<object class="IBUIView" id="1071212265">
 							<reference key="NSNextResponder" ref="191373211"/>
 							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{9, 390}, {304, 21}}</string>
+							<string key="NSFrameSize">{255, 20}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="58090836"/>
-							<bool key="IBUIOpaque">NO</bool>
-							<bool key="IBUIClipsSubviews">YES</bool>
-							<bool key="IBUIUserInteractionEnabled">NO</bool>
+							<reference key="NSNextKeyView" ref="201618948"/>
+							<string key="NSReuseIdentifierKey">_NS:196</string>
+							<object class="NSColor" key="IBUIBackgroundColor" id="81217398">
+								<int key="NSColorSpace">3</int>
+								<bytes key="NSWhite">MCAwAA</bytes>
+							</object>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							<string key="IBUIText">status</string>
-							<object class="NSColor" key="IBUITextColor">
-								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MCAwIDAAA</bytes>
-							</object>
-							<nil key="IBUIHighlightedColor"/>
-							<int key="IBUIBaselineAdjustment">1</int>
-							<float key="IBUIMinimumFontSize">10</float>
-							<object class="IBUIFontDescription" key="IBUIFontDescription">
-								<int key="type">1</int>
-								<double key="pointSize">17</double>
-							</object>
-							<object class="NSFont" key="IBUIFont">
-								<string key="NSName">Helvetica</string>
-								<double key="NSSize">17</double>
-								<int key="NSfFlags">16</int>
-							</object>
-						</object>
-						<object class="IBUIButton" id="1070392235">
-							<reference key="NSNextResponder" ref="191373211"/>
-							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{213, 64}, {107, 66}}</string>
-							<reference key="NSSuperview" ref="191373211"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="539158319"/>
-							<bool key="IBUIOpaque">NO</bool>
-							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							<int key="IBUIContentHorizontalAlignment">0</int>
-							<int key="IBUIContentVerticalAlignment">0</int>
-							<string key="IBUINormalTitle">3</string>
-							<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
-							<object class="NSColor" key="IBUINormalTitleColor">
-								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
-							</object>
-							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="393925159">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">clavier-01-106px.png</string>
-							</object>
-							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="657314226"/>
-						</object>
-						<object class="IBUIButton" id="539158319">
-							<reference key="NSNextResponder" ref="191373211"/>
-							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{0, 130}, {107, 66}}</string>
-							<reference key="NSSuperview" ref="191373211"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="539781036"/>
-							<bool key="IBUIOpaque">NO</bool>
-							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							<int key="IBUIContentHorizontalAlignment">0</int>
-							<int key="IBUIContentVerticalAlignment">0</int>
-							<string key="IBUINormalTitle">4</string>
-							<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
-							<object class="NSColor" key="IBUINormalTitleColor">
-								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
-							</object>
-							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<reference key="IBUINormalBackgroundImage" ref="393925159"/>
-							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="657314226"/>
-						</object>
-						<object class="IBUIButton" id="539781036">
-							<reference key="NSNextResponder" ref="191373211"/>
-							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{107, 130}, {106, 66}}</string>
-							<reference key="NSSuperview" ref="191373211"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="573280603"/>
-							<bool key="IBUIOpaque">NO</bool>
-							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							<int key="IBUIContentHorizontalAlignment">0</int>
-							<int key="IBUIContentVerticalAlignment">0</int>
-							<string key="IBUINormalTitle">5</string>
-							<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
-							<object class="NSColor" key="IBUINormalTitleColor">
-								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
-							</object>
-							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="794309420">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">clavier-01-108px.png</string>
-							</object>
-							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="657314226"/>
-						</object>
-						<object class="IBUIButton" id="573280603">
-							<reference key="NSNextResponder" ref="191373211"/>
-							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{213, 130}, {107, 66}}</string>
-							<reference key="NSSuperview" ref="191373211"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="150499342"/>
-							<bool key="IBUIOpaque">NO</bool>
-							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							<int key="IBUIContentHorizontalAlignment">0</int>
-							<int key="IBUIContentVerticalAlignment">0</int>
-							<string key="IBUINormalTitle">6</string>
-							<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
-							<object class="NSColor" key="IBUINormalTitleColor">
-								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
-							</object>
-							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<reference key="IBUINormalBackgroundImage" ref="393925159"/>
-							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="657314226"/>
-						</object>
-						<object class="IBUIButton" id="150499342">
-							<reference key="NSNextResponder" ref="191373211"/>
-							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{0, 196}, {107, 66}}</string>
-							<reference key="NSSuperview" ref="191373211"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="616388880"/>
-							<bool key="IBUIOpaque">NO</bool>
-							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							<int key="IBUIContentHorizontalAlignment">0</int>
-							<int key="IBUIContentVerticalAlignment">0</int>
-							<string key="IBUINormalTitle">7</string>
-							<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
-							<object class="NSColor" key="IBUINormalTitleColor">
-								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
-							</object>
-							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<reference key="IBUINormalBackgroundImage" ref="393925159"/>
-							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="657314226"/>
-						</object>
-						<object class="IBUIButton" id="624378925">
-							<reference key="NSNextResponder" ref="191373211"/>
-							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{213, 196}, {107, 66}}</string>
-							<reference key="NSSuperview" ref="191373211"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="465571136"/>
-							<bool key="IBUIOpaque">NO</bool>
-							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							<int key="IBUIContentHorizontalAlignment">0</int>
-							<int key="IBUIContentVerticalAlignment">0</int>
-							<string key="IBUINormalTitle">9</string>
-							<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
-							<object class="NSColor" key="IBUINormalTitleColor">
-								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
-							</object>
-							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<reference key="IBUINormalBackgroundImage" ref="393925159"/>
-							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="657314226"/>
-						</object>
-						<object class="IBUIButton" id="607229252">
-							<reference key="NSNextResponder" ref="191373211"/>
-							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{107, 64}, {106, 66}}</string>
-							<reference key="NSSuperview" ref="191373211"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="1070392235"/>
-							<bool key="IBUIOpaque">NO</bool>
-							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							<int key="IBUIContentHorizontalAlignment">0</int>
-							<int key="IBUIContentVerticalAlignment">0</int>
-							<string key="IBUINormalTitle">2</string>
-							<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
-							<object class="NSColor" key="IBUINormalTitleColor">
-								<int key="NSColorSpace">1</int>
-								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
-							</object>
-							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<reference key="IBUINormalBackgroundImage" ref="794309420"/>
-							<reference key="IBUIFontDescription" ref="857420967"/>
-							<reference key="IBUIFont" ref="657314226"/>
 						</object>
 						<object class="IBUIButton" id="201618948">
 							<reference key="NSNextResponder" ref="191373211"/>
 							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{0, 64}, {107, 66}}</string>
+							<string key="NSFrame">{{0, 81}, {107, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="607229252"/>
@@ -357,83 +169,158 @@
 								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
 							</object>
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<reference key="IBUINormalBackgroundImage" ref="393925159"/>
+							<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="843737900">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">clavier-01-106px.png</string>
+							</object>
 							<reference key="IBUIFontDescription" ref="857420967"/>
 							<reference key="IBUIFont" ref="657314226"/>
 						</object>
-						<object class="IBUIButton" id="465571136">
+						<object class="IBUIButton" id="607229252">
 							<reference key="NSNextResponder" ref="191373211"/>
 							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{0, 262}, {107, 66}}</string>
+							<string key="NSFrame">{{107, 81}, {106, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="602859574"/>
+							<reference key="NSNextKeyView" ref="1070392235"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 							<int key="IBUIContentHorizontalAlignment">0</int>
 							<int key="IBUIContentVerticalAlignment">0</int>
-							<string key="IBUINormalTitle">*</string>
+							<string key="IBUINormalTitle">2</string>
 							<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
 							<object class="NSColor" key="IBUINormalTitleColor">
 								<int key="NSColorSpace">1</int>
 								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
 							</object>
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<reference key="IBUINormalBackgroundImage" ref="393925159"/>
+							<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="704265688">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">clavier-01-108px.png</string>
+							</object>
 							<reference key="IBUIFontDescription" ref="857420967"/>
 							<reference key="IBUIFont" ref="657314226"/>
 						</object>
-						<object class="IBUIButton" id="602859574">
+						<object class="IBUIButton" id="1070392235">
 							<reference key="NSNextResponder" ref="191373211"/>
 							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{107, 262}, {106, 66}}</string>
+							<string key="NSFrame">{{213, 81}, {107, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="310945439"/>
+							<reference key="NSNextKeyView" ref="539158319"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 							<int key="IBUIContentHorizontalAlignment">0</int>
 							<int key="IBUIContentVerticalAlignment">0</int>
-							<string key="IBUINormalTitle">0+</string>
+							<string key="IBUINormalTitle">3</string>
 							<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
 							<object class="NSColor" key="IBUINormalTitleColor">
 								<int key="NSColorSpace">1</int>
 								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
 							</object>
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<reference key="IBUINormalBackgroundImage" ref="794309420"/>
+							<reference key="IBUINormalBackgroundImage" ref="843737900"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
 							<reference key="IBUIFont" ref="657314226"/>
 						</object>
-						<object class="IBUIButton" id="310945439">
+						<object class="IBUIButton" id="539158319">
 							<reference key="NSNextResponder" ref="191373211"/>
 							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{213, 262}, {107, 66}}</string>
+							<string key="NSFrame">{{0, 147}, {107, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="661303162"/>
+							<reference key="NSNextKeyView" ref="539781036"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 							<int key="IBUIContentHorizontalAlignment">0</int>
 							<int key="IBUIContentVerticalAlignment">0</int>
-							<string key="IBUINormalTitle">#</string>
+							<string key="IBUINormalTitle">4</string>
 							<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
 							<object class="NSColor" key="IBUINormalTitleColor">
 								<int key="NSColorSpace">1</int>
 								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
 							</object>
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<reference key="IBUINormalBackgroundImage" ref="393925159"/>
+							<reference key="IBUINormalBackgroundImage" ref="843737900"/>
+							<reference key="IBUIFontDescription" ref="857420967"/>
+							<reference key="IBUIFont" ref="657314226"/>
+						</object>
+						<object class="IBUIButton" id="539781036">
+							<reference key="NSNextResponder" ref="191373211"/>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{107, 147}, {106, 66}}</string>
+							<reference key="NSSuperview" ref="191373211"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="573280603"/>
+							<bool key="IBUIOpaque">NO</bool>
+							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+							<int key="IBUIContentHorizontalAlignment">0</int>
+							<int key="IBUIContentVerticalAlignment">0</int>
+							<string key="IBUINormalTitle">5</string>
+							<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
+							<object class="NSColor" key="IBUINormalTitleColor">
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+							</object>
+							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
+							<reference key="IBUINormalBackgroundImage" ref="704265688"/>
+							<reference key="IBUIFontDescription" ref="857420967"/>
+							<reference key="IBUIFont" ref="657314226"/>
+						</object>
+						<object class="IBUIButton" id="573280603">
+							<reference key="NSNextResponder" ref="191373211"/>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{213, 147}, {107, 66}}</string>
+							<reference key="NSSuperview" ref="191373211"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="150499342"/>
+							<bool key="IBUIOpaque">NO</bool>
+							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+							<int key="IBUIContentHorizontalAlignment">0</int>
+							<int key="IBUIContentVerticalAlignment">0</int>
+							<string key="IBUINormalTitle">6</string>
+							<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
+							<object class="NSColor" key="IBUINormalTitleColor">
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+							</object>
+							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
+							<reference key="IBUINormalBackgroundImage" ref="843737900"/>
+							<reference key="IBUIFontDescription" ref="857420967"/>
+							<reference key="IBUIFont" ref="657314226"/>
+						</object>
+						<object class="IBUIButton" id="150499342">
+							<reference key="NSNextResponder" ref="191373211"/>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{0, 213}, {107, 66}}</string>
+							<reference key="NSSuperview" ref="191373211"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="616388880"/>
+							<bool key="IBUIOpaque">NO</bool>
+							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+							<int key="IBUIContentHorizontalAlignment">0</int>
+							<int key="IBUIContentVerticalAlignment">0</int>
+							<string key="IBUINormalTitle">7</string>
+							<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
+							<object class="NSColor" key="IBUINormalTitleColor">
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+							</object>
+							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
+							<reference key="IBUINormalBackgroundImage" ref="843737900"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
 							<reference key="IBUIFont" ref="657314226"/>
 						</object>
 						<object class="IBUIButton" id="616388880">
 							<reference key="NSNextResponder" ref="191373211"/>
 							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{107, 196}, {106, 66}}</string>
+							<string key="NSFrame">{{107, 213}, {106, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="624378925"/>
@@ -449,14 +336,106 @@
 								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
 							</object>
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<reference key="IBUINormalBackgroundImage" ref="794309420"/>
+							<reference key="IBUINormalBackgroundImage" ref="704265688"/>
+							<reference key="IBUIFontDescription" ref="857420967"/>
+							<reference key="IBUIFont" ref="657314226"/>
+						</object>
+						<object class="IBUIButton" id="624378925">
+							<reference key="NSNextResponder" ref="191373211"/>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{213, 213}, {107, 66}}</string>
+							<reference key="NSSuperview" ref="191373211"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="465571136"/>
+							<bool key="IBUIOpaque">NO</bool>
+							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+							<int key="IBUIContentHorizontalAlignment">0</int>
+							<int key="IBUIContentVerticalAlignment">0</int>
+							<string key="IBUINormalTitle">9</string>
+							<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
+							<object class="NSColor" key="IBUINormalTitleColor">
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+							</object>
+							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
+							<reference key="IBUINormalBackgroundImage" ref="843737900"/>
+							<reference key="IBUIFontDescription" ref="857420967"/>
+							<reference key="IBUIFont" ref="657314226"/>
+						</object>
+						<object class="IBUIButton" id="465571136">
+							<reference key="NSNextResponder" ref="191373211"/>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{0, 279}, {107, 66}}</string>
+							<reference key="NSSuperview" ref="191373211"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="602859574"/>
+							<bool key="IBUIOpaque">NO</bool>
+							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+							<int key="IBUIContentHorizontalAlignment">0</int>
+							<int key="IBUIContentVerticalAlignment">0</int>
+							<string key="IBUINormalTitle">*</string>
+							<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
+							<object class="NSColor" key="IBUINormalTitleColor">
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+							</object>
+							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
+							<reference key="IBUINormalBackgroundImage" ref="843737900"/>
+							<reference key="IBUIFontDescription" ref="857420967"/>
+							<reference key="IBUIFont" ref="657314226"/>
+						</object>
+						<object class="IBUIButton" id="602859574">
+							<reference key="NSNextResponder" ref="191373211"/>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{107, 279}, {106, 66}}</string>
+							<reference key="NSSuperview" ref="191373211"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="310945439"/>
+							<bool key="IBUIOpaque">NO</bool>
+							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+							<int key="IBUIContentHorizontalAlignment">0</int>
+							<int key="IBUIContentVerticalAlignment">0</int>
+							<string key="IBUINormalTitle">0+</string>
+							<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
+							<object class="NSColor" key="IBUINormalTitleColor">
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+							</object>
+							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
+							<reference key="IBUINormalBackgroundImage" ref="704265688"/>
+							<reference key="IBUIFontDescription" ref="857420967"/>
+							<reference key="IBUIFont" ref="657314226"/>
+						</object>
+						<object class="IBUIButton" id="310945439">
+							<reference key="NSNextResponder" ref="191373211"/>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{213, 279}, {107, 66}}</string>
+							<reference key="NSSuperview" ref="191373211"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="661303162"/>
+							<bool key="IBUIOpaque">NO</bool>
+							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+							<int key="IBUIContentHorizontalAlignment">0</int>
+							<int key="IBUIContentVerticalAlignment">0</int>
+							<string key="IBUINormalTitle">#</string>
+							<reference key="IBUIHighlightedTitleColor" ref="923326808"/>
+							<object class="NSColor" key="IBUINormalTitleColor">
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
+							</object>
+							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
+							<reference key="IBUINormalBackgroundImage" ref="843737900"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
 							<reference key="IBUIFont" ref="657314226"/>
 						</object>
 						<object class="IBUIButton" id="58090836">
 							<reference key="NSNextResponder" ref="191373211"/>
 							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{160, 328}, {160, 66}}</string>
+							<string key="NSFrame">{{160, 345}, {160, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView"/>
@@ -490,7 +469,7 @@
 						<object class="IBUIButton" id="661303162">
 							<reference key="NSNextResponder" ref="191373211"/>
 							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{0, 328}, {160, 66}}</string>
+							<string key="NSFrame">{{0, 345}, {160, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="963225980"/>
@@ -505,10 +484,15 @@
 								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
 							</object>
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
+							<object class="NSCustomResource" key="IBUIDisabledImage" id="1039826645">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">startcall-gray.png</string>
+							</object>
 							<object class="NSCustomResource" key="IBUINormalImage" id="428573416">
 								<string key="NSClassName">NSImage</string>
 								<string key="NSResourceName">startcall-green.png</string>
 							</object>
+							<reference key="IBUIDisabledBackgroundImage" ref="398389003"/>
 							<reference key="IBUINormalBackgroundImage" ref="398389003"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
 							<reference key="IBUIFont" ref="657314226"/>
@@ -516,10 +500,10 @@
 						<object class="IBUIButton" id="963225980">
 							<reference key="NSNextResponder" ref="191373211"/>
 							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{0, 328}, {320, 66}}</string>
+							<string key="NSFrame">{{0, 345}, {320, 66}}</string>
 							<reference key="NSSuperview" ref="191373211"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="729745965"/>
+							<reference key="NSNextKeyView" ref="58090836"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -531,7 +515,9 @@
 								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
 							</object>
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
+							<reference key="IBUIDisabledImage" ref="1039826645"/>
 							<reference key="IBUINormalImage" ref="428573416"/>
+							<reference key="IBUIDisabledBackgroundImage" ref="398389003"/>
 							<reference key="IBUINormalBackgroundImage" ref="398389003"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
 							<reference key="IBUIFont" ref="657314226"/>
@@ -541,10 +527,7 @@
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="235890962"/>
-					<object class="NSColor" key="IBUIBackgroundColor">
-						<int key="NSColorSpace">3</int>
-						<bytes key="NSWhite">MCAwAA</bytes>
-					</object>
+					<reference key="IBUIBackgroundColor" ref="81217398"/>
 					<int key="IBUIContentMode">5</int>
 					<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				</object>
@@ -568,14 +551,6 @@
 					</object>
 					<int key="connectionID">12</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">status</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="729745965"/>
-					</object>
-					<int key="connectionID">15</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">view</string>
@@ -680,14 +655,6 @@
 					</object>
 					<int key="connectionID">54</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">erase</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="366108332"/>
-					</object>
-					<int key="connectionID">151</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">dialerView</string>
@@ -720,6 +687,22 @@
 					</object>
 					<int key="connectionID">164</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">statusViewHolder</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="1071212265"/>
+					</object>
+					<int key="connectionID">169</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">erase</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="366108332"/>
+					</object>
+					<int key="connectionID">151</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">delegate</string>
@@ -765,23 +748,23 @@
 						<reference key="object" ref="191373211"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="201618948"/>
-							<reference ref="607229252"/>
 							<reference ref="1070392235"/>
 							<reference ref="465571136"/>
-							<reference ref="729745965"/>
 							<reference ref="310945439"/>
 							<reference ref="602859574"/>
-							<reference ref="624378925"/>
-							<reference ref="150499342"/>
-							<reference ref="573280603"/>
-							<reference ref="539781036"/>
-							<reference ref="539158319"/>
 							<reference ref="235890962"/>
 							<reference ref="58090836"/>
-							<reference ref="616388880"/>
 							<reference ref="661303162"/>
 							<reference ref="963225980"/>
+							<reference ref="539158319"/>
+							<reference ref="539781036"/>
+							<reference ref="573280603"/>
+							<reference ref="150499342"/>
+							<reference ref="624378925"/>
+							<reference ref="616388880"/>
+							<reference ref="201618948"/>
+							<reference ref="607229252"/>
+							<reference ref="1071212265"/>
 						</object>
 						<reference key="parent" ref="627403670"/>
 					</object>
@@ -811,11 +794,6 @@
 						<reference key="parent" ref="191373211"/>
 						<string key="objectName">Call-short</string>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">7</int>
-						<reference key="object" ref="729745965"/>
-						<reference key="parent" ref="191373211"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">35</int>
 						<reference key="object" ref="616388880"/>
@@ -861,18 +839,12 @@
 						<reference key="object" ref="235890962"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="751637181"/>
 							<reference ref="366108332"/>
+							<reference ref="751637181"/>
 						</object>
 						<reference key="parent" ref="191373211"/>
 						<string key="objectName">Dialer</string>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">150</int>
-						<reference key="object" ref="366108332"/>
-						<reference key="parent" ref="235890962"/>
-						<string key="objectName">Erase</string>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">4</int>
 						<reference key="object" ref="751637181"/>
@@ -891,6 +863,18 @@
 						<reference key="parent" ref="191373211"/>
 						<string key="objectName">Call-large</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">165</int>
+						<reference key="object" ref="1071212265"/>
+						<reference key="parent" ref="191373211"/>
+						<string key="objectName">status_view</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">150</int>
+						<reference key="object" ref="366108332"/>
+						<reference key="parent" ref="235890962"/>
+						<string key="objectName">Erase</string>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -909,6 +893,8 @@
 					<string>160.IBPluginDependency</string>
 					<string>162.CustomClassName</string>
 					<string>162.IBPluginDependency</string>
+					<string>162.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
+					<string>165.IBPluginDependency</string>
 					<string>29.CustomClassName</string>
 					<string>29.IBPluginDependency</string>
 					<string>30.CustomClassName</string>
@@ -936,7 +922,7 @@
 					<string>41.IBPluginDependency</string>
 					<string>5.CustomClassName</string>
 					<string>5.IBPluginDependency</string>
-					<string>7.IBPluginDependency</string>
+					<string>5.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
 					<string>80.IBPluginDependency</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
@@ -950,7 +936,7 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="IBUserGuide">
 							<reference key="view" ref="191373211"/>
-							<double key="location">410</double>
+							<double key="location">412</double>
 							<int key="affinity">1</int>
 						</object>
 						<object class="IBUserGuide">
@@ -965,6 +951,8 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UICallButton</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<real value="3"/>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UIDigitButton</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UIDigitButton</string>
@@ -992,7 +980,7 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UICallButton</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<real value="3"/>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				</object>
 			</object>
@@ -1008,7 +996,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">164</int>
+			<int key="maxID">169</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1056,17 +1044,6 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">PhoneViewController</string>
 					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">doKeyPad:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">doKeyPad:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">doKeyPad:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
 					<object class="NSMutableDictionary" key="outlets">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
@@ -1089,6 +1066,7 @@
 							<string>six</string>
 							<string>star</string>
 							<string>status</string>
+							<string>statusViewHolder</string>
 							<string>switchCamera</string>
 							<string>three</string>
 							<string>two</string>
@@ -1114,6 +1092,7 @@
 							<string>UIButton</string>
 							<string>UIButton</string>
 							<string>UILabel</string>
+							<string>UIView</string>
 							<string>UIButton</string>
 							<string>UIButton</string>
 							<string>UIButton</string>
@@ -1142,6 +1121,7 @@
 							<string>six</string>
 							<string>star</string>
 							<string>status</string>
+							<string>statusViewHolder</string>
 							<string>switchCamera</string>
 							<string>three</string>
 							<string>two</string>
@@ -1221,6 +1201,10 @@
 								<string key="name">status</string>
 								<string key="candidateClassName">UILabel</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">statusViewHolder</string>
+								<string key="candidateClassName">UIView</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">switchCamera</string>
 								<string key="candidateClassName">UIButton</string>
@@ -1290,6 +1274,7 @@
 				<string>clavier-01-108px.png</string>
 				<string>clavier-01-160px.png</string>
 				<string>effacer.png</string>
+				<string>startcall-gray.png</string>
 				<string>startcall-green.png</string>
 			</object>
 			<object class="NSMutableArray" key="dict.values">
@@ -1299,6 +1284,7 @@
 				<string>{160, 60}</string>
 				<string>{66, 65}</string>
 				<string>{60, 52}</string>
+				<string>{60, 52}</string>
 			</object>
 		</object>
 		<string key="IBCocoaTouchPluginVersion">933</string>
diff --git a/Classes/StatusSubViewController.h b/Classes/StatusSubViewController.h
new file mode 100644
index 000000000..72e4997eb
--- /dev/null
+++ b/Classes/StatusSubViewController.h
@@ -0,0 +1,34 @@
+/* StatusSubViewController.h
+ *
+ * Copyright (C) 2011  Belledonne Comunications, Grenoble, France
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or   
+ *  (at your option) any later version.                                 
+ *                                                                      
+ *  This program is distributed in the hope that it will be useful,     
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of      
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the       
+ *  GNU Library General Public License for more details.                
+ *                                                                      
+ *  You should have received a copy of the GNU General Public License   
+ *  along with this program; if not, write to the Free Software         
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */     
+#import <UIKit/UIKit.h>
+#include "linphonecore.h"
+
+@interface StatusSubViewController : UIViewController {
+    UIImageView* image;
+    UIActivityIndicatorView* spinner;
+    UILabel* label;
+}
+
+@property (nonatomic, retain) IBOutlet UIImageView* image;
+@property (nonatomic, retain) IBOutlet UIActivityIndicatorView* spinner;
+@property (nonatomic, retain) IBOutlet UILabel* label;
+
+-(BOOL) updateWithRegistrationState:(LinphoneRegistrationState)state message:(NSString*) message;
+
+@end
diff --git a/Classes/StatusSubViewController.m b/Classes/StatusSubViewController.m
new file mode 100644
index 000000000..e0d1cadcb
--- /dev/null
+++ b/Classes/StatusSubViewController.m
@@ -0,0 +1,99 @@
+/* StatusSubViewController.h
+ *
+ * Copyright (C) 2011  Belledonne Comunications, Grenoble, France
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or   
+ *  (at your option) any later version.                                 
+ *                                                                      
+ *  This program is distributed in the hope that it will be useful,     
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of      
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the       
+ *  GNU Library General Public License for more details.                
+ *                                                                      
+ *  You should have received a copy of the GNU General Public License   
+ *  along with this program; if not, write to the Free Software         
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */     
+
+#import "StatusSubViewController.h"
+
+@implementation StatusSubViewController
+
+@synthesize image;
+@synthesize spinner;
+@synthesize label;
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+- (void)didReceiveMemoryWarning
+{
+    // Releases the view if it doesn't have a superview.
+    [super didReceiveMemoryWarning];
+    
+    // Release any cached data, images, etc that aren't in use.
+}
+
+#pragma mark - View lifecycle
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+-(BOOL) updateWithRegistrationState:(LinphoneRegistrationState)state message:(NSString*) message {
+    
+    switch(state) {
+        case LinphoneRegistrationCleared:
+            image.hidden = NO;
+            [image setImage:[UIImage imageNamed:@"status_orange.png"]];
+            [spinner stopAnimating];
+            [label setText:message != nil ? message : NSLocalizedString(@"No SIP account defined", nil)];
+            return YES;
+        case LinphoneRegistrationFailed:
+            image.hidden = NO;
+            [image setImage:[UIImage imageNamed:@"status_red.png"]];
+            [spinner stopAnimating];
+            [label setText:message];
+            return NO;
+        case LinphoneRegistrationNone:
+            image.hidden = NO;
+            [image setImage:[UIImage imageNamed:@"status_gray.png"]];
+            [spinner stopAnimating];
+            [label setText:message];
+            return NO;
+        case LinphoneRegistrationProgress:
+            image.hidden = YES;
+            spinner.hidden = NO;
+            [spinner startAnimating];
+            [label setText:message];
+            return NO;
+        case LinphoneRegistrationOk:
+            image.hidden = NO;
+            [image setImage:[UIImage imageNamed:@"status_green.png"]];
+            [spinner stopAnimating];
+            [label setText:message];
+            return YES;
+    }
+    return NO;
+}
+
+@end
diff --git a/Classes/StatusSubViewController.xib b/Classes/StatusSubViewController.xib
new file mode 100644
index 000000000..12478957f
--- /dev/null
+++ b/Classes/StatusSubViewController.xib
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1280</int>
+		<string key="IBDocument.SystemVersion">11C74</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
+		<string key="IBDocument.AppKitVersion">1138.23</string>
+		<string key="IBDocument.HIToolboxVersion">567.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+			<string key="NS.object.0">933</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBUIImageView</string>
+			<string>IBUIActivityIndicatorView</string>
+			<string>IBUIView</string>
+			<string>IBUILabel</string>
+			<string>IBProxyObject</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="IBProxyObject" id="372490531">
+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBProxyObject" id="975951072">
+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBUIView" id="848661322">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">292</int>
+				<array class="NSMutableArray" key="NSSubviews">
+					<object class="IBUIImageView" id="332800514">
+						<reference key="NSNextResponder" ref="848661322"/>
+						<int key="NSvFlags">292</int>
+						<string key="NSFrame">{{0, -1}, {25, 23}}</string>
+						<reference key="NSSuperview" ref="848661322"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="665185352"/>
+						<string key="NSReuseIdentifierKey">_NS:567</string>
+						<bool key="IBUIUserInteractionEnabled">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<object class="NSCustomResource" key="IBUIImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">status_orange.png</string>
+						</object>
+					</object>
+					<object class="IBUIActivityIndicatorView" id="665185352">
+						<reference key="NSNextResponder" ref="848661322"/>
+						<int key="NSvFlags">-2147483356</int>
+						<string key="NSFrame">{{0, 1}, {20, 20}}</string>
+						<reference key="NSSuperview" ref="848661322"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="200467549"/>
+						<string key="NSReuseIdentifierKey">_NS:1030</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<int key="IBUIStyle">2</int>
+					</object>
+					<object class="IBUILabel" id="200467549">
+						<reference key="NSNextResponder" ref="848661322"/>
+						<int key="NSvFlags">292</int>
+						<string key="NSFrame">{{28, 0}, {280, 21}}</string>
+						<reference key="NSSuperview" ref="848661322"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
+						<string key="NSReuseIdentifierKey">_NS:328</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<bool key="IBUIClipsSubviews">YES</bool>
+						<int key="IBUIContentMode">7</int>
+						<bool key="IBUIUserInteractionEnabled">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<string key="IBUIText">No SIP account defined</string>
+						<object class="NSColor" key="IBUITextColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+						</object>
+						<nil key="IBUIHighlightedColor"/>
+						<int key="IBUIBaselineAdjustment">1</int>
+						<float key="IBUIMinimumFontSize">10</float>
+						<object class="IBUIFontDescription" key="IBUIFontDescription">
+							<int key="type">1</int>
+							<double key="pointSize">17</double>
+						</object>
+						<object class="NSFont" key="IBUIFont">
+							<string key="NSName">Helvetica</string>
+							<double key="NSSize">17</double>
+							<int key="NSfFlags">16</int>
+						</object>
+					</object>
+				</array>
+				<string key="NSFrameSize">{255, 23}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="332800514"/>
+				<string key="NSReuseIdentifierKey">_NS:196</string>
+				<object class="NSColor" key="IBUIBackgroundColor">
+					<int key="NSColorSpace">3</int>
+					<bytes key="NSWhite">MCAwAA</bytes>
+				</object>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">image</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="332800514"/>
+					</object>
+					<int key="connectionID">8</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">label</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="200467549"/>
+					</object>
+					<int key="connectionID">9</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">spinner</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="665185352"/>
+					</object>
+					<int key="connectionID">10</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="848661322"/>
+					</object>
+					<int key="connectionID">11</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="372490531"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="975951072"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="848661322"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="665185352"/>
+							<reference ref="332800514"/>
+							<reference ref="200467549"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">status_view</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="665185352"/>
+						<reference key="parent" ref="848661322"/>
+						<string key="objectName">status_spin</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="200467549"/>
+						<reference key="parent" ref="848661322"/>
+						<string key="objectName">status_label</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="332800514"/>
+						<reference key="parent" ref="848661322"/>
+						<string key="objectName">status_image</string>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.CustomClassName">StatusSubViewController</string>
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="-2.CustomClassName">UIResponder</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">11</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">StatusSubViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="image">UIImageView</string>
+						<string key="label">UILabel</string>
+						<string key="spinner">UIActivityIndicatorView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="image">
+							<string key="name">image</string>
+							<string key="candidateClassName">UIImageView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="label">
+							<string key="name">label</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="spinner">
+							<string key="name">spinner</string>
+							<string key="candidateClassName">UIActivityIndicatorView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/StatusSubViewController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NS.key.0">status_orange.png</string>
+			<string key="NS.object.0">{25, 23}</string>
+		</object>
+		<string key="IBCocoaTouchPluginVersion">933</string>
+	</data>
+</archive>
diff --git a/Resources/startcall-gray.png b/Resources/startcall-gray.png
new file mode 100644
index 000000000..360e7baa0
Binary files /dev/null and b/Resources/startcall-gray.png differ
diff --git a/Resources/status_gray.png b/Resources/status_gray.png
new file mode 100644
index 000000000..b4f871f3e
Binary files /dev/null and b/Resources/status_gray.png differ
diff --git a/Resources/status_green.png b/Resources/status_green.png
new file mode 100644
index 000000000..1a39a4242
Binary files /dev/null and b/Resources/status_green.png differ
diff --git a/Resources/status_offline.png b/Resources/status_offline.png
new file mode 100644
index 000000000..243c5c069
Binary files /dev/null and b/Resources/status_offline.png differ
diff --git a/Resources/status_orange.png b/Resources/status_orange.png
new file mode 100644
index 000000000..f2e66d34d
Binary files /dev/null and b/Resources/status_orange.png differ
diff --git a/Resources/status_red.png b/Resources/status_red.png
new file mode 100644
index 000000000..e7a0ec98a
Binary files /dev/null and b/Resources/status_red.png differ
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index a57d43ab8..62637bae8 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -234,6 +234,22 @@
 		340A75B114C0670B006AA708 /* ConferenceCallDetailView-ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 340A75AF14C0670A006AA708 /* ConferenceCallDetailView-ipad.xib */; };
 		3418843714C58BB100EA48C7 /* nowebcamCIF.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 3418843614C58BB100EA48C7 /* nowebcamCIF.jpg */; };
 		3418843814C58BB100EA48C7 /* nowebcamCIF.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 3418843614C58BB100EA48C7 /* nowebcamCIF.jpg */; };
+		3418844814C6CAD300EA48C7 /* StatusSubViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3418844614C6CAD300EA48C7 /* StatusSubViewController.m */; };
+		3418844914C6CAD300EA48C7 /* StatusSubViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3418844614C6CAD300EA48C7 /* StatusSubViewController.m */; };
+		3418844A14C6CAD300EA48C7 /* StatusSubViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3418844714C6CAD300EA48C7 /* StatusSubViewController.xib */; };
+		3418844B14C6CAD300EA48C7 /* StatusSubViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3418844714C6CAD300EA48C7 /* StatusSubViewController.xib */; };
+		3418844D14C6D1CE00EA48C7 /* startcall-gray.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418844C14C6D1CE00EA48C7 /* startcall-gray.png */; };
+		3418844E14C6D1CE00EA48C7 /* startcall-gray.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418844C14C6D1CE00EA48C7 /* startcall-gray.png */; };
+		3418845314C6F66F00EA48C7 /* status_green.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418844F14C6F66E00EA48C7 /* status_green.png */; };
+		3418845414C6F66F00EA48C7 /* status_green.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418844F14C6F66E00EA48C7 /* status_green.png */; };
+		3418845514C6F66F00EA48C7 /* status_offline.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418845014C6F66F00EA48C7 /* status_offline.png */; };
+		3418845614C6F66F00EA48C7 /* status_offline.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418845014C6F66F00EA48C7 /* status_offline.png */; };
+		3418845714C6F66F00EA48C7 /* status_orange.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418845114C6F66F00EA48C7 /* status_orange.png */; };
+		3418845814C6F66F00EA48C7 /* status_orange.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418845114C6F66F00EA48C7 /* status_orange.png */; };
+		3418845914C6F66F00EA48C7 /* status_red.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418845214C6F66F00EA48C7 /* status_red.png */; };
+		3418845A14C6F66F00EA48C7 /* status_red.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418845214C6F66F00EA48C7 /* status_red.png */; };
+		3418845C14C7077400EA48C7 /* status_gray.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418845B14C7077400EA48C7 /* status_gray.png */; };
+		3418845D14C7077400EA48C7 /* status_gray.png in Resources */ = {isa = PBXBuildFile; fileRef = 3418845B14C7077400EA48C7 /* status_gray.png */; };
 		341FCA8E149798210084BC26 /* linphonerc-ipad in Resources */ = {isa = PBXBuildFile; fileRef = 341FCA8D149798210084BC26 /* linphonerc-ipad */; };
 		341FCA8F149798210084BC26 /* linphonerc-ipad in Resources */ = {isa = PBXBuildFile; fileRef = 341FCA8D149798210084BC26 /* linphonerc-ipad */; };
 		3422AA5014975EC9000D4E8A /* InCallViewController-ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3422AA4F14975EC9000D4E8A /* InCallViewController-ipad.xib */; };
@@ -617,6 +633,15 @@
 		32CA4F630368D1EE00C91783 /* linphone_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linphone_Prefix.pch; sourceTree = "<group>"; };
 		340A75AF14C0670A006AA708 /* ConferenceCallDetailView-ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "ConferenceCallDetailView-ipad.xib"; sourceTree = "<group>"; };
 		3418843614C58BB100EA48C7 /* nowebcamCIF.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = nowebcamCIF.jpg; path = submodules/linphone/mediastreamer2/src/nowebcamCIF.jpg; sourceTree = "<group>"; };
+		3418844514C6CAD300EA48C7 /* StatusSubViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatusSubViewController.h; sourceTree = "<group>"; };
+		3418844614C6CAD300EA48C7 /* StatusSubViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StatusSubViewController.m; sourceTree = "<group>"; };
+		3418844714C6CAD300EA48C7 /* StatusSubViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = StatusSubViewController.xib; sourceTree = "<group>"; };
+		3418844C14C6D1CE00EA48C7 /* startcall-gray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "startcall-gray.png"; path = "Resources/startcall-gray.png"; sourceTree = "<group>"; };
+		3418844F14C6F66E00EA48C7 /* status_green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = status_green.png; path = Resources/status_green.png; sourceTree = "<group>"; };
+		3418845014C6F66F00EA48C7 /* status_offline.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = status_offline.png; path = Resources/status_offline.png; sourceTree = "<group>"; };
+		3418845114C6F66F00EA48C7 /* status_orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = status_orange.png; path = Resources/status_orange.png; sourceTree = "<group>"; };
+		3418845214C6F66F00EA48C7 /* status_red.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = status_red.png; path = Resources/status_red.png; sourceTree = "<group>"; };
+		3418845B14C7077400EA48C7 /* status_gray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = status_gray.png; path = Resources/status_gray.png; sourceTree = "<group>"; };
 		341FCA8D149798210084BC26 /* linphonerc-ipad */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "linphonerc-ipad"; sourceTree = "<group>"; };
 		3422AA4F14975EC9000D4E8A /* InCallViewController-ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "InCallViewController-ipad.xib"; sourceTree = "<group>"; };
 		3422AA5214978352000D4E8A /* PhoneViewController-ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "PhoneViewController-ipad.xib"; sourceTree = "<group>"; };
@@ -778,6 +803,9 @@
 				34CA8537148F692A00503C01 /* MainScreenWithVideoPreview.h */,
 				34CA8538148F692A00503C01 /* MainScreenWithVideoPreview.m */,
 				34CA852E148F646700503C01 /* MainScreenWithVideoPreview.xib */,
+				3418844514C6CAD300EA48C7 /* StatusSubViewController.h */,
+				3418844614C6CAD300EA48C7 /* StatusSubViewController.m */,
+				3418844714C6CAD300EA48C7 /* StatusSubViewController.xib */,
 			);
 			path = Classes;
 			sourceTree = "<group>";
@@ -1176,6 +1204,12 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				3418845B14C7077400EA48C7 /* status_gray.png */,
+				3418844F14C6F66E00EA48C7 /* status_green.png */,
+				3418845014C6F66F00EA48C7 /* status_offline.png */,
+				3418845114C6F66F00EA48C7 /* status_orange.png */,
+				3418845214C6F66F00EA48C7 /* status_red.png */,
+				3418844C14C6D1CE00EA48C7 /* startcall-gray.png */,
 				3418843614C58BB100EA48C7 /* nowebcamCIF.jpg */,
 				1AE0A49214AC5C64002C99BD /* mic_active.png */,
 				1AE0A49314AC5C64002C99BD /* stat_sys_signal_0.png */,
@@ -1372,6 +1406,13 @@
 				1AE0A4A214AC5C64002C99BD /* stat_sys_signal_4.png in Resources */,
 				340A75B014C0670B006AA708 /* ConferenceCallDetailView-ipad.xib in Resources */,
 				3418843714C58BB100EA48C7 /* nowebcamCIF.jpg in Resources */,
+				3418844A14C6CAD300EA48C7 /* StatusSubViewController.xib in Resources */,
+				3418844D14C6D1CE00EA48C7 /* startcall-gray.png in Resources */,
+				3418845314C6F66F00EA48C7 /* status_green.png in Resources */,
+				3418845514C6F66F00EA48C7 /* status_offline.png in Resources */,
+				3418845714C6F66F00EA48C7 /* status_orange.png in Resources */,
+				3418845914C6F66F00EA48C7 /* status_red.png in Resources */,
+				3418845C14C7077400EA48C7 /* status_gray.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1442,6 +1483,13 @@
 				1AE0A4A314AC5C64002C99BD /* stat_sys_signal_4.png in Resources */,
 				340A75B114C0670B006AA708 /* ConferenceCallDetailView-ipad.xib in Resources */,
 				3418843814C58BB100EA48C7 /* nowebcamCIF.jpg in Resources */,
+				3418844B14C6CAD300EA48C7 /* StatusSubViewController.xib in Resources */,
+				3418844E14C6D1CE00EA48C7 /* startcall-gray.png in Resources */,
+				3418845414C6F66F00EA48C7 /* status_green.png in Resources */,
+				3418845614C6F66F00EA48C7 /* status_offline.png in Resources */,
+				3418845814C6F66F00EA48C7 /* status_orange.png in Resources */,
+				3418845A14C6F66F00EA48C7 /* status_red.png in Resources */,
+				3418845D14C7077400EA48C7 /* status_gray.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1479,6 +1527,7 @@
 				22D817AD147A9F33001CFB9C /* UIAddVideoButton.m in Sources */,
 				344ABD77147FCB68007420B6 /* ConferenceCallDetailView.m in Sources */,
 				34CA8539148F692A00503C01 /* MainScreenWithVideoPreview.m in Sources */,
+				3418844814C6CAD300EA48C7 /* StatusSubViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1513,6 +1562,7 @@
 				22D817AE147A9F33001CFB9C /* UIAddVideoButton.m in Sources */,
 				344ABD78147FCB68007420B6 /* ConferenceCallDetailView.m in Sources */,
 				34CA853A148F692A00503C01 /* MainScreenWithVideoPreview.m in Sources */,
+				3418844914C6CAD300EA48C7 /* StatusSubViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/submodules/linphone b/submodules/linphone
index ae0857e88..e647665bc 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit ae0857e88c8bac66c5e825de10c261ff322614f6
+Subproject commit e647665bc3013e5b42f3b88c669000714e6fd948