diff --git a/Classes/AboutViewController.xib b/Classes/AboutViewController.xib
index b8a93f174..b5157bef8 100644
--- a/Classes/AboutViewController.xib
+++ b/Classes/AboutViewController.xib
@@ -36,7 +36,7 @@
 				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
-			<object class="IBUIScrollView" id="219194068">
+			<object class="IBUIScrollView" id="457997634">
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<string key="NSFrameSize">{320, 460}</string>
@@ -49,18 +49,18 @@
 				<bool key="IBUIAlwaysBounceVertical">YES</bool>
 				<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
 			</object>
-			<object class="IBUIView" id="421185651">
+			<object class="IBUIView" id="775128611">
 				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">292</int>
+				<int key="NSvFlags">274</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBUIImageView" id="913505980">
-						<reference key="NSNextResponder" ref="421185651"/>
-						<int key="NSvFlags">301</int>
+					<object class="IBUIImageView" id="97290309">
+						<reference key="NSNextResponder" ref="775128611"/>
+						<int key="NSvFlags">293</int>
 						<string key="NSFrame">{{124, 20}, {72, 72}}</string>
-						<reference key="NSSuperview" ref="421185651"/>
+						<reference key="NSSuperview" ref="775128611"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="908257632"/>
+						<reference key="NSNextKeyView" ref="945733244"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -69,13 +69,13 @@
 							<string key="NSResourceName">linphone_icon_72.png</string>
 						</object>
 					</object>
-					<object class="IBUILabel" id="908257632">
-						<reference key="NSNextResponder" ref="421185651"/>
-						<int key="NSvFlags">292</int>
+					<object class="IBUILabel" id="945733244">
+						<reference key="NSNextResponder" ref="775128611"/>
+						<int key="NSvFlags">293</int>
 						<string key="NSFrame">{{20, 100}, {280, 50}}</string>
-						<reference key="NSSuperview" ref="421185651"/>
+						<reference key="NSSuperview" ref="775128611"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="874908727"/>
+						<reference key="NSNextKeyView" ref="966549235"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -83,7 +83,7 @@
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<string key="IBUIText">Linphone</string>
-						<object class="NSColor" key="IBUITextColor" id="540727998">
+						<object class="NSColor" key="IBUITextColor" id="549716735">
 							<int key="NSColorSpace">2</int>
 							<bytes key="NSRGB">MC4zNTY4NjI3NTM2IDAuMzk2MDc4NDM3NiAwLjQzNTI5NDEyMTUAA</bytes>
 						</object>
@@ -101,13 +101,13 @@
 						</object>
 						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 					</object>
-					<object class="IBUILabel" id="457670017">
-						<reference key="NSNextResponder" ref="421185651"/>
-						<int key="NSvFlags">292</int>
+					<object class="IBUILabel" id="55823705">
+						<reference key="NSNextResponder" ref="775128611"/>
+						<int key="NSvFlags">293</int>
 						<string key="NSFrame">{{20, 187}, {280, 44}}</string>
-						<reference key="NSSuperview" ref="421185651"/>
+						<reference key="NSSuperview" ref="775128611"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="95691842"/>
+						<reference key="NSNextKeyView" ref="697092436"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -124,19 +124,19 @@
 							<int key="type">1</int>
 							<double key="pointSize">17</double>
 						</object>
-						<object class="NSFont" key="IBUIFont" id="1015475260">
+						<object class="NSFont" key="IBUIFont" id="901921461">
 							<string key="NSName">Helvetica</string>
 							<double key="NSSize">17</double>
 							<int key="NSfFlags">16</int>
 						</object>
 					</object>
-					<object class="IBUILabel" id="874908727">
-						<reference key="NSNextResponder" ref="421185651"/>
-						<int key="NSvFlags">292</int>
+					<object class="IBUILabel" id="966549235">
+						<reference key="NSNextResponder" ref="775128611"/>
+						<int key="NSvFlags">293</int>
 						<string key="NSFrame">{{20, 138}, {280, 21}}</string>
-						<reference key="NSSuperview" ref="421185651"/>
+						<reference key="NSSuperview" ref="775128611"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="876685434"/>
+						<reference key="NSNextKeyView" ref="132342957"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -144,28 +144,28 @@
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<string key="IBUIText">Linphone iPhone 1.0</string>
-						<reference key="IBUITextColor" ref="540727998"/>
+						<reference key="IBUITextColor" ref="549716735"/>
 						<nil key="IBUIHighlightedColor"/>
 						<int key="IBUIBaselineAdjustment">0</int>
 						<int key="IBUITextAlignment">1</int>
-						<object class="IBUIFontDescription" key="IBUIFontDescription" id="813822661">
+						<object class="IBUIFontDescription" key="IBUIFontDescription" id="741880680">
 							<int key="type">1</int>
 							<double key="pointSize">13</double>
 						</object>
-						<object class="NSFont" key="IBUIFont" id="543522899">
+						<object class="NSFont" key="IBUIFont" id="141611231">
 							<string key="NSName">Helvetica</string>
 							<double key="NSSize">13</double>
 							<int key="NSfFlags">16</int>
 						</object>
 						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 					</object>
-					<object class="IBUILabel" id="876685434">
-						<reference key="NSNextResponder" ref="421185651"/>
-						<int key="NSvFlags">292</int>
+					<object class="IBUILabel" id="132342957">
+						<reference key="NSNextResponder" ref="775128611"/>
+						<int key="NSvFlags">293</int>
 						<string key="NSFrame">{{20, 158}, {280, 21}}</string>
-						<reference key="NSSuperview" ref="421185651"/>
+						<reference key="NSSuperview" ref="775128611"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="457670017"/>
+						<reference key="NSNextKeyView" ref="55823705"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -173,19 +173,19 @@
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<string key="IBUIText">Linphone Core 1.0</string>
-						<reference key="IBUITextColor" ref="540727998"/>
+						<reference key="IBUITextColor" ref="549716735"/>
 						<nil key="IBUIHighlightedColor"/>
 						<int key="IBUIBaselineAdjustment">0</int>
 						<int key="IBUITextAlignment">1</int>
-						<reference key="IBUIFontDescription" ref="813822661"/>
-						<reference key="IBUIFont" ref="543522899"/>
+						<reference key="IBUIFontDescription" ref="741880680"/>
+						<reference key="IBUIFont" ref="141611231"/>
 						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 					</object>
-					<object class="IBUILabel" id="680581417">
-						<reference key="NSNextResponder" ref="421185651"/>
-						<int key="NSvFlags">292</int>
+					<object class="IBUILabel" id="28600489">
+						<reference key="NSNextResponder" ref="775128611"/>
+						<int key="NSvFlags">293</int>
 						<string key="NSFrame">{{20, 269}, {280, 21}}</string>
-						<reference key="NSSuperview" ref="421185651"/>
+						<reference key="NSSuperview" ref="775128611"/>
 						<reference key="NSWindow"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -203,15 +203,15 @@
 						<float key="IBUIMinimumFontSize">10</float>
 						<int key="IBUITextAlignment">1</int>
 						<reference key="IBUIFontDescription" ref="151194520"/>
-						<reference key="IBUIFont" ref="1015475260"/>
+						<reference key="IBUIFont" ref="901921461"/>
 					</object>
-					<object class="IBUILabel" id="95691842">
-						<reference key="NSNextResponder" ref="421185651"/>
-						<int key="NSvFlags">292</int>
+					<object class="IBUILabel" id="697092436">
+						<reference key="NSNextResponder" ref="775128611"/>
+						<int key="NSvFlags">293</int>
 						<string key="NSFrame">{{20, 225}, {280, 36}}</string>
-						<reference key="NSSuperview" ref="421185651"/>
+						<reference key="NSSuperview" ref="775128611"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="680581417"/>
+						<reference key="NSNextKeyView" ref="28600489"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -224,7 +224,7 @@
 						<int key="IBUINumberOfLines">0</int>
 						<int key="IBUITextAlignment">1</int>
 						<reference key="IBUIFontDescription" ref="151194520"/>
-						<reference key="IBUIFont" ref="1015475260"/>
+						<reference key="IBUIFont" ref="901921461"/>
 						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 						<double key="preferredMaxLayoutWidth">280</double>
 					</object>
@@ -232,7 +232,7 @@
 				<string key="NSFrameSize">{320, 310}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="913505980"/>
+				<reference key="NSNextKeyView" ref="97290309"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@@ -248,7 +248,7 @@
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">linkLabel</string>
 						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="457670017"/>
+						<reference key="destination" ref="55823705"/>
 					</object>
 					<int key="connectionID">60</int>
 				</object>
@@ -256,7 +256,7 @@
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">view</string>
 						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="219194068"/>
+						<reference key="destination" ref="457997634"/>
 					</object>
 					<int key="connectionID">63</int>
 				</object>
@@ -264,7 +264,7 @@
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">contentView</string>
 						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="421185651"/>
+						<reference key="destination" ref="775128611"/>
 					</object>
 					<int key="connectionID">64</int>
 				</object>
@@ -272,7 +272,7 @@
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">linphoneCoreVersionLabel</string>
 						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="876685434"/>
+						<reference key="destination" ref="132342957"/>
 					</object>
 					<int key="connectionID">67</int>
 				</object>
@@ -280,7 +280,7 @@
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">linphoneIphoneVersionLabel</string>
 						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="874908727"/>
+						<reference key="destination" ref="966549235"/>
 					</object>
 					<int key="connectionID">68</int>
 				</object>
@@ -309,7 +309,7 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">62</int>
-						<reference key="object" ref="219194068"/>
+						<reference key="object" ref="457997634"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 						</object>
@@ -317,59 +317,59 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">51</int>
-						<reference key="object" ref="421185651"/>
+						<reference key="object" ref="775128611"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="913505980"/>
-							<reference ref="908257632"/>
-							<reference ref="876685434"/>
-							<reference ref="457670017"/>
-							<reference ref="680581417"/>
-							<reference ref="874908727"/>
-							<reference ref="95691842"/>
+							<reference ref="97290309"/>
+							<reference ref="945733244"/>
+							<reference ref="132342957"/>
+							<reference ref="55823705"/>
+							<reference ref="28600489"/>
+							<reference ref="966549235"/>
+							<reference ref="697092436"/>
 						</object>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">61</int>
-						<reference key="object" ref="95691842"/>
-						<reference key="parent" ref="421185651"/>
+						<reference key="object" ref="697092436"/>
+						<reference key="parent" ref="775128611"/>
 						<string key="objectName">licenceLabel</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">58</int>
-						<reference key="object" ref="680581417"/>
-						<reference key="parent" ref="421185651"/>
+						<reference key="object" ref="28600489"/>
+						<reference key="parent" ref="775128611"/>
 						<string key="objectName">copyrightLabel</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">57</int>
-						<reference key="object" ref="457670017"/>
-						<reference key="parent" ref="421185651"/>
+						<reference key="object" ref="55823705"/>
+						<reference key="parent" ref="775128611"/>
 						<string key="objectName">linkLabel</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">56</int>
-						<reference key="object" ref="908257632"/>
-						<reference key="parent" ref="421185651"/>
+						<reference key="object" ref="945733244"/>
+						<reference key="parent" ref="775128611"/>
 						<string key="objectName">linphoneLabel</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">55</int>
-						<reference key="object" ref="913505980"/>
-						<reference key="parent" ref="421185651"/>
+						<reference key="object" ref="97290309"/>
+						<reference key="parent" ref="775128611"/>
 						<string key="objectName">iconImageView</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">65</int>
-						<reference key="object" ref="874908727"/>
-						<reference key="parent" ref="421185651"/>
+						<reference key="object" ref="966549235"/>
+						<reference key="parent" ref="775128611"/>
 						<string key="objectName">linphoneIphoneVersionLabel</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">66</int>
-						<reference key="object" ref="876685434"/>
-						<reference key="parent" ref="421185651"/>
+						<reference key="object" ref="132342957"/>
+						<reference key="parent" ref="775128611"/>
 						<string key="objectName">linphoneCoreVersionLabel</string>
 					</object>
 				</object>
diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m
index 8cd1420f3..bcc09cbcc 100644
--- a/Classes/ChatRoomViewController.m
+++ b/Classes/ChatRoomViewController.m
@@ -118,7 +118,8 @@ static UICompositeViewDescription *compositeDescription = nil;
 	messageField.maxNumberOfLines = ([LinphoneManager runningOnIpad])?10:3;
     messageField.delegate = self;
 	messageField.font = [UIFont systemFontOfSize:18.0f];
-    messageField.contentInset = UIEdgeInsetsMake(1, 1, 0, 0);
+    messageField.contentInset = UIEdgeInsetsMake(0, -5, -2, -5);
+    messageField.internalTextView.scrollIndicatorInsets = UIEdgeInsetsMake(0, 0, 0, 10);
     messageField.backgroundColor = [UIColor clearColor];
     [sendButton setEnabled:FALSE];
     
diff --git a/Classes/InCallViewController.m b/Classes/InCallViewController.m
index d094e4ffe..fe947b19e 100644
--- a/Classes/InCallViewController.m
+++ b/Classes/InCallViewController.m
@@ -191,7 +191,8 @@ static UICompositeViewDescription *compositeDescription = nil;
     
     [videoCameraSwitch setPreview:videoPreview];
     
-    removeTableBackground([callTableController view]);
+    [callTableController.tableView setBackgroundColor:[UIColor clearColor]]; // Can't do it in Xib: issue with ios4
+    [callTableController.tableView setBackgroundView:nil]; // Can't do it in Xib: issue with ios4
 }
 
 - (void)viewDidUnload {
diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index 853dd5d19..96a72f668 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -412,7 +412,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
                 || [self valueChangedForKey:@"port_preference"]
                 || [self valueChangedForKey:@"random_port_preference"]
 				|| [self valueChangedForKey:@"prefix_preference"]
-				|| [self valueChangedForKey:@"substitute_+_by_00_preference"];
+				|| [self valueChangedForKey:@"substitute_+_by_00_preference"]
+                || [self valueChangedForKey:@"pushnotification_preference"];
 	
 	if (account_changed)
 		[self synchronizeAccount];
diff --git a/Classes/LinphoneUI/UIChatRoomCell.xib b/Classes/LinphoneUI/UIChatRoomCell.xib
index 6014ce950..37dc84cbc 100644
--- a/Classes/LinphoneUI/UIChatRoomCell.xib
+++ b/Classes/LinphoneUI/UIChatRoomCell.xib
@@ -42,7 +42,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{5, 5}, {310, 130}}</string>
 						<reference key="NSSuperview" ref="579600281"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="456806949"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -65,7 +64,6 @@
 										<int key="NSvFlags">274</int>
 										<string key="NSFrameSize">{294, 104}</string>
 										<reference key="NSSuperview" ref="773132586"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="281972462"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<int key="IBUIContentMode">1</int>
@@ -77,7 +75,6 @@
 										<int key="NSvFlags">274</int>
 										<string key="NSFrameSize">{294, 104}</string>
 										<reference key="NSSuperview" ref="773132586"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="872109847"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<object class="NSColor" key="IBUIBackgroundColor" id="765717609">
@@ -115,7 +112,6 @@
 										<int key="NSvFlags">301</int>
 										<string key="NSFrame">{{81, 33}, {132, 37}}</string>
 										<reference key="NSSuperview" ref="773132586"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="859609488"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
@@ -148,7 +144,6 @@
 								</array>
 								<string key="NSFrameSize">{294, 104}</string>
 								<reference key="NSSuperview" ref="456806949"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="546512518"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="765717609"/>
@@ -160,7 +155,6 @@
 								<int key="NSvFlags">265</int>
 								<string key="NSFrame">{{0, 104}, {280, 10}}</string>
 								<reference key="NSSuperview" ref="456806949"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="197441422"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="765717609"/>
@@ -191,7 +185,6 @@
 								<int key="NSvFlags">265</int>
 								<string key="NSFrame">{{284, 104}, {10, 10}}</string>
 								<reference key="NSSuperview" ref="456806949"/>
-								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -205,7 +198,6 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{250, 0}, {44, 44}}</string>
 								<reference key="NSSuperview" ref="456806949"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="504194589"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -232,7 +224,6 @@
 						</array>
 						<string key="NSFrame">{{13, 13}, {294, 114}}</string>
 						<reference key="NSSuperview" ref="579600281"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="773132586"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="765717609"/>
@@ -242,7 +233,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 140}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="340144998"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="765717609"/>
@@ -255,7 +245,6 @@
 				<int key="NSvFlags">274</int>
 				<string key="NSFrameSize">{100, 100}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="765717609"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -265,7 +254,6 @@
 				<int key="NSvFlags">274</int>
 				<string key="NSFrameSize">{100, 100}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="765717609"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -515,86 +503,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">42</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">UIChatRoomCell</string>
-					<string key="superclassName">UITableViewCell</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onDeleteClick:">id</string>
-						<string key="onDownloadClick:">id</string>
-						<string key="onImageClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onDeleteClick:">
-							<string key="name">onDeleteClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onDownloadClick:">
-							<string key="name">onDownloadClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onImageClick:">
-							<string key="name">onImageClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="backgroundImage">UIImageView</string>
-						<string key="bubbleView">UIView</string>
-						<string key="dateLabel">UILabel</string>
-						<string key="deleteButton">UIButton</string>
-						<string key="downloadButton">UITapGestureRecognizer</string>
-						<string key="innerView">UIView</string>
-						<string key="messageImageView">UIImageView</string>
-						<string key="messageLabel">UILabel</string>
-						<string key="statusImage">UIImageView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="backgroundImage">
-							<string key="name">backgroundImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="bubbleView">
-							<string key="name">bubbleView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="dateLabel">
-							<string key="name">dateLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="deleteButton">
-							<string key="name">deleteButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="downloadButton">
-							<string key="name">downloadButton</string>
-							<string key="candidateClassName">UITapGestureRecognizer</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="innerView">
-							<string key="name">innerView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="messageImageView">
-							<string key="name">messageImageView</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="messageLabel">
-							<string key="name">messageLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="statusImage">
-							<string key="name">statusImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIChatRoomCell.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
diff --git a/Classes/LinphoneUI/UIContactDetailsHeader.m b/Classes/LinphoneUI/UIContactDetailsHeader.m
index 96a1a95e9..2d5c3c076 100644
--- a/Classes/LinphoneUI/UIContactDetailsHeader.m
+++ b/Classes/LinphoneUI/UIContactDetailsHeader.m
@@ -84,7 +84,8 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    removeTableBackground(tableView); // Can't do it in Xib: issue with ios4
+    [tableView setBackgroundColor:[UIColor clearColor]]; // Can't do it in Xib: issue with ios4
+    [tableView setBackgroundView:nil]; // Can't do it in Xib: issue with ios4
     [normalView setAlpha:1.0f];
     [editView setAlpha:0.0f];
     [tableView setEditing:TRUE animated:false];
diff --git a/Classes/LinphoneUI/UILinphone.h b/Classes/LinphoneUI/UILinphone.h
index 01a93958b..6a9cefe02 100644
--- a/Classes/LinphoneUI/UILinphone.h
+++ b/Classes/LinphoneUI/UILinphone.h
@@ -34,4 +34,3 @@
 
 @end
 
-void removeTableBackground(UIView* view);
diff --git a/Classes/LinphoneUI/UILinphone.m b/Classes/LinphoneUI/UILinphone.m
index b1788b19e..6449e4a59 100644
--- a/Classes/LinphoneUI/UILinphone.m
+++ b/Classes/LinphoneUI/UILinphone.m
@@ -92,15 +92,3 @@
 }
 
 @end
-
-void removeTableBackground(UIView*view) {
-    if([view isKindOfClass:[UITableView class]]) {
-        [view setBackgroundColor:[UIColor clearColor]];
-    }
-    if([view isKindOfClass:[UIImageView class]] && [[view superview] isKindOfClass:[UITableView class]]) {
-        [(UIImageView*)view setImage:nil];
-    }
-    for(UIView *subview in [view subviews]) {
-        removeTableBackground(subview);
-    }
-}
diff --git a/Classes/LinphoneUI/UILinphoneButton.h b/Classes/LinphoneUI/UILinphoneButton.h
new file mode 100644
index 000000000..7b390c40d
--- /dev/null
+++ b/Classes/LinphoneUI/UILinphoneButton.h
@@ -0,0 +1,30 @@
+/* UILinphoneButton.h
+ *
+ * Copyright (C) 2012  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>
+#import <NinePatch.h>
+
+@interface UILinphoneButton : UIButton {
+    
+}
+
+@property (retain, nonatomic) IBOutlet TUNinePatch *backgroundNinePatch;
+@property (retain, nonatomic) IBOutlet TUNinePatch *backgroundOverNinePatch;
+
+@end
diff --git a/Classes/LinphoneUI/UILinphoneButton.m b/Classes/LinphoneUI/UILinphoneButton.m
new file mode 100644
index 000000000..530044db1
--- /dev/null
+++ b/Classes/LinphoneUI/UILinphoneButton.m
@@ -0,0 +1,78 @@
+/* UILinphoneButton.m
+ *
+ * Copyright (C) 2012  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 "UILinphoneButton.h"
+
+@implementation UILinphoneButton
+
+@synthesize backgroundNinePatch;
+@synthesize backgroundOverNinePatch;
+
+
+#pragma mark - Lifecycle Functions
+
+- (void)initUILinphoneButton {
+    self.backgroundNinePatch = [TUNinePatch ninePatchNamed:@"button_background_default"];
+    self.backgroundOverNinePatch = [TUNinePatch ninePatchNamed:@"button_background_over"];
+    [self setBackgroundImage:nil forState:UIControlStateNormal];
+    [self setBackgroundImage:nil forState:UIControlStateHighlighted];
+    [self setContentMode:UIViewContentModeRedraw];
+}
+
+- (id)init {
+    self = [super init];
+    if(self != nil) {
+        [self initUILinphoneButton];
+    }
+    return self;
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder {
+    self = [super initWithCoder:aDecoder];
+    if(self != nil) {
+        [self initUILinphoneButton];
+    }
+    return self;
+}
+
+- (id)initWithFrame:(CGRect)frame {
+    self = [super initWithFrame:frame];
+    if(self != nil) {
+        [self initUILinphoneButton];
+    }
+    return self;
+}
+
+- (void)setHighlighted:(BOOL)highlighted {
+    [super setHighlighted:highlighted];
+    [self setNeedsDisplay];
+}
+
+- (void)drawRect:(CGRect)rect {
+    // we ignore the rect and redraw the entire view
+    CGContextRef context = UIGraphicsGetCurrentContext();
+    if (context) {
+        if(self.highlighted) {
+            [self.backgroundOverNinePatch inContext:context drawInRect:[self bounds]];
+        } else {
+            [self.backgroundNinePatch inContext:context drawInRect:[self bounds]];   
+        }
+    }
+}
+
+@end
diff --git a/Classes/LinphoneUI/UILinphoneTextField.h b/Classes/LinphoneUI/UILinphoneTextField.h
new file mode 100644
index 000000000..a6445665e
--- /dev/null
+++ b/Classes/LinphoneUI/UILinphoneTextField.h
@@ -0,0 +1,29 @@
+/* UILinphoneTextField.h
+ *
+ * Copyright (C) 2012  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>
+#import <NinePatch.h>
+
+@interface UILinphoneTextField : UITextField {
+    
+}
+
+@property (retain, nonatomic) IBOutlet TUNinePatch *backgroundNinePatch;
+
+@end
diff --git a/Classes/LinphoneUI/UILinphoneTextField.m b/Classes/LinphoneUI/UILinphoneTextField.m
new file mode 100644
index 000000000..8eaf12fc4
--- /dev/null
+++ b/Classes/LinphoneUI/UILinphoneTextField.m
@@ -0,0 +1,85 @@
+/* UILinphoneTextField.m
+ *
+ * Copyright (C) 2012  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 "UILinphoneTextField.h"
+
+@implementation UILinphoneTextField
+
+@synthesize backgroundNinePatch;
+
+
+#pragma mark - Lifecycle Functions
+
+- (void)initUILinphoneTextField {
+    self.backgroundNinePatch = [TUNinePatch ninePatchNamed:@"field_background"];
+    self.background = nil;
+    [self setContentMode:UIViewContentModeRedraw];
+}
+
+- (id)init {
+    self = [super init];
+    if(self != nil) {
+        [self initUILinphoneTextField];
+    }
+    return self;
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder {
+    self = [super initWithCoder:aDecoder];
+    if(self != nil) {
+        [self initUILinphoneTextField];
+    }
+    return self;
+}
+
+- (id)initWithFrame:(CGRect)frame {
+    self = [super initWithFrame:frame];
+    if(self != nil) {
+        [self initUILinphoneTextField];
+    }
+    return self;
+}
+
+- (void)dealloc {
+    [backgroundNinePatch release];
+    
+    [super dealloc];
+}
+
+- (CGRect)textRectForBounds:(CGRect)bounds {
+    return CGRectInset(bounds, 6, 4);
+}
+
+- (CGRect)placeholderRectForBounds:(CGRect)bounds {
+    return CGRectInset(bounds, 6, 4);
+}
+
+- (CGRect)editingRectForBounds:(CGRect)bounds {
+    return CGRectInset(bounds, 6, 4);
+}
+
+- (void)drawRect:(CGRect)rect {
+    // we ignore the rect and redraw the entire view
+    CGContextRef context = UIGraphicsGetCurrentContext();
+    if (context) {
+        [self.backgroundNinePatch inContext:context drawInRect:[self bounds]];
+    }
+}
+
+@end
diff --git a/Classes/LinphoneUI/en.lproj/UIMainBar.xib b/Classes/LinphoneUI/en.lproj/UIMainBar.xib
index cb27c7c36..9b06cec18 100644
--- a/Classes/LinphoneUI/en.lproj/UIMainBar.xib
+++ b/Classes/LinphoneUI/en.lproj/UIMainBar.xib
@@ -42,7 +42,6 @@
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{0, 11}, {320, 66}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="698962606"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -61,7 +60,6 @@
 						<int key="NSvFlags">290</int>
 						<string key="NSFrame">{{0, 77}, {320, 2000}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
@@ -75,7 +73,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrameSize">{64, 77}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="83510153"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -138,7 +135,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{21, 21}</string>
 								<reference key="NSSuperview" ref="698962606"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="364959328"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -153,7 +149,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{2, 2}, {17, 17}}</string>
 								<reference key="NSSuperview" ref="698962606"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="617445003"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -180,7 +175,6 @@
 						</array>
 						<string key="NSFrame">{{38, 1}, {21, 21}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="307047814"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor" id="41402419">
@@ -196,7 +190,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{64, 0}, {64, 77}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="562688945"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -236,7 +229,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{256, 0}, {64, 77}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="55915342"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -276,7 +268,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{128, 0}, {64, 77}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="60891552"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -315,7 +306,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{192, 0}, {64, 77}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="154031566"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -359,7 +349,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{21, 21}</string>
 								<reference key="NSSuperview" ref="154031566"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="540244639"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -371,7 +360,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{2, 2}, {17, 17}}</string>
 								<reference key="NSSuperview" ref="154031566"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="760939856"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -395,7 +383,6 @@
 						</array>
 						<string key="NSFrame">{{197, 1}, {21, 21}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="651674302"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="41402419"/>
@@ -406,7 +393,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 77}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="318948703"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
diff --git a/Classes/LinphoneUI/en.lproj/UIMainBar~ipad.xib b/Classes/LinphoneUI/en.lproj/UIMainBar~ipad.xib
index e8646ae44..d72f12f02 100644
--- a/Classes/LinphoneUI/en.lproj/UIMainBar~ipad.xib
+++ b/Classes/LinphoneUI/en.lproj/UIMainBar~ipad.xib
@@ -42,7 +42,6 @@
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{0, 11}, {768, 66}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="16083720"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -61,7 +60,6 @@
 						<int key="NSvFlags">290</int>
 						<string key="NSFrame">{{0, 77}, {768, 2000}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="877138605"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -76,7 +74,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrameSize">{175, 77}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="783828575"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -140,7 +137,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{21, 21}</string>
 								<reference key="NSSuperview" ref="16083720"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="690072035"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -155,7 +151,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{2, 2}, {17, 17}}</string>
 								<reference key="NSSuperview" ref="16083720"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1012118169"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -182,7 +177,6 @@
 						</array>
 						<string key="NSFrame">{{144, 1}, {21, 21}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="459410862"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor" id="339339950">
@@ -199,7 +193,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{175, 0}, {175, 77}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="103487099"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -240,7 +233,6 @@
 						<int key="NSvFlags">288</int>
 						<string key="NSFrame">{{350, -1}, {68, 80}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="66637371"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -280,7 +272,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{593, 0}, {175, 77}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="686020189"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -321,7 +312,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{418, 0}, {175, 77}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="582329659"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -366,7 +356,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{21, 21}</string>
 								<reference key="NSSuperview" ref="686020189"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="541323646"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -378,7 +367,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{2, 2}, {17, 17}}</string>
 								<reference key="NSSuperview" ref="686020189"/>
-								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
@@ -401,7 +389,6 @@
 						</array>
 						<string key="NSFrame">{{428, 1}, {21, 21}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="765093070"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="339339950"/>
@@ -413,7 +400,6 @@
 				</array>
 				<string key="NSFrameSize">{768, 77}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="172706520"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -432,7 +418,6 @@
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{0, 19}, {1024, 67}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="948217795"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -451,7 +436,6 @@
 						<int key="NSvFlags">290</int>
 						<string key="NSFrame">{{0, 86}, {1024, 2000}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="174827909"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -466,7 +450,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrameSize">{240, 86}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="91594118"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -511,7 +494,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{21, 21}</string>
 								<reference key="NSSuperview" ref="948217795"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="281444351"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -523,7 +505,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{2, 2}, {17, 17}}</string>
 								<reference key="NSSuperview" ref="948217795"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="872188125"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -543,7 +524,6 @@
 						</array>
 						<string key="NSFrame">{{209, 1}, {21, 21}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="70667666"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="339339950"/>
@@ -557,7 +537,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{240, 0}, {240, 86}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="849328902"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -598,7 +577,6 @@
 						<int key="NSvFlags">288</int>
 						<string key="NSFrame">{{480, 8}, {68, 80}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="730250721"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -622,7 +600,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{784, 0}, {240, 86}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<int key="IBUITag">5</int>
@@ -662,7 +639,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{548, 0}, {240, 86}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="129284976"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -707,7 +683,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{21, 21}</string>
 								<reference key="NSSuperview" ref="129284976"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="183279807"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -719,7 +694,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{2, 2}, {17, 17}}</string>
 								<reference key="NSSuperview" ref="129284976"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="13787191"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -739,7 +713,6 @@
 						</array>
 						<string key="NSFrame">{{558, 1}, {21, 21}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="669403928"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="339339950"/>
@@ -751,7 +724,6 @@
 				</array>
 				<string key="NSFrameSize">{1024, 86}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="938095300"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -1195,118 +1167,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">62</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">TPMultiLayoutViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="landscapeView">UIView</string>
-						<string key="portraitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="landscapeView">
-							<string key="name">landscapeView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="portraitView">
-							<string key="name">portraitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIMainBar</string>
-					<string key="superclassName">TPMultiLayoutViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onChatClick:">id</string>
-						<string key="onContactsClick:">id</string>
-						<string key="onDialerClick:">id</string>
-						<string key="onHistoryClick:">id</string>
-						<string key="onSettingsClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onChatClick:">
-							<string key="name">onChatClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onContactsClick:">
-							<string key="name">onContactsClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onDialerClick:">
-							<string key="name">onDialerClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onHistoryClick:">
-							<string key="name">onHistoryClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onSettingsClick:">
-							<string key="name">onSettingsClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="chatButton">UIButton</string>
-						<string key="chatNotificationLabel">UILabel</string>
-						<string key="chatNotificationView">UIView</string>
-						<string key="contactsButton">UIButton</string>
-						<string key="dialerButton">UIButton</string>
-						<string key="historyButton">UIButton</string>
-						<string key="historyNotificationLabel">UILabel</string>
-						<string key="historyNotificationView">UIView</string>
-						<string key="settingsButton">UIButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="chatButton">
-							<string key="name">chatButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="chatNotificationLabel">
-							<string key="name">chatNotificationLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="chatNotificationView">
-							<string key="name">chatNotificationView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="contactsButton">
-							<string key="name">contactsButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="dialerButton">
-							<string key="name">dialerButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="historyButton">
-							<string key="name">historyButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="historyNotificationLabel">
-							<string key="name">historyNotificationLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="historyNotificationView">
-							<string key="name">historyNotificationView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="settingsButton">
-							<string key="name">settingsButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIMainBar.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
diff --git a/Classes/LinphoneUI/fr.lproj/UIMainBar~ipad.xib b/Classes/LinphoneUI/fr.lproj/UIMainBar~ipad.xib
index c06698b75..386e55f3c 100644
--- a/Classes/LinphoneUI/fr.lproj/UIMainBar~ipad.xib
+++ b/Classes/LinphoneUI/fr.lproj/UIMainBar~ipad.xib
@@ -1165,118 +1165,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">62</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">TPMultiLayoutViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="landscapeView">UIView</string>
-						<string key="portraitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="landscapeView">
-							<string key="name">landscapeView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="portraitView">
-							<string key="name">portraitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIMainBar</string>
-					<string key="superclassName">TPMultiLayoutViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onChatClick:">id</string>
-						<string key="onContactsClick:">id</string>
-						<string key="onDialerClick:">id</string>
-						<string key="onHistoryClick:">id</string>
-						<string key="onSettingsClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onChatClick:">
-							<string key="name">onChatClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onContactsClick:">
-							<string key="name">onContactsClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onDialerClick:">
-							<string key="name">onDialerClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onHistoryClick:">
-							<string key="name">onHistoryClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onSettingsClick:">
-							<string key="name">onSettingsClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="chatButton">UIButton</string>
-						<string key="chatNotificationLabel">UILabel</string>
-						<string key="chatNotificationView">UIView</string>
-						<string key="contactsButton">UIButton</string>
-						<string key="dialerButton">UIButton</string>
-						<string key="historyButton">UIButton</string>
-						<string key="historyNotificationLabel">UILabel</string>
-						<string key="historyNotificationView">UIView</string>
-						<string key="settingsButton">UIButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="chatButton">
-							<string key="name">chatButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="chatNotificationLabel">
-							<string key="name">chatNotificationLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="chatNotificationView">
-							<string key="name">chatNotificationView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="contactsButton">
-							<string key="name">contactsButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="dialerButton">
-							<string key="name">dialerButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="historyButton">
-							<string key="name">historyButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="historyNotificationLabel">
-							<string key="name">historyNotificationLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="historyNotificationView">
-							<string key="name">historyNotificationView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="settingsButton">
-							<string key="name">settingsButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIMainBar.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m
index d3fc142f6..6e7cbdc45 100644
--- a/Classes/SettingsViewController.m
+++ b/Classes/SettingsViewController.m
@@ -191,11 +191,7 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
-    UIEdgeInsets inset = {0, 0, 10, 0};
-    UIScrollView *scrollView = self.tableView;
-    [scrollView setContentInset:inset];
-    [scrollView setScrollIndicatorInsets:inset];
+
     
     [self.tableView setBackgroundColor:[UIColor clearColor]]; // Can't do it in Xib: issue with ios4
     [self.tableView setBackgroundView:nil]; // Can't do it in Xib: issue with ios4
@@ -209,6 +205,16 @@
     return self;
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    
+    
+    UIEdgeInsets inset = {0, 0, 10, 0};
+    UIScrollView *scrollView = self.tableView;
+    [scrollView setContentInset:inset];
+    [scrollView setScrollIndicatorInsets:inset];
+}
+
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
     
@@ -304,7 +310,6 @@
 
 + (void)removeBackground:(UIView*)view {
     [view setBackgroundColor:[UIColor clearColor]];
-    removeTableBackground(view);
 }
 
 - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated {
diff --git a/Classes/Utils/GrowingTextView/HPGrowingTextView.m b/Classes/Utils/GrowingTextView/HPGrowingTextView.m
index 40a088a6f..177c0e346 100755
--- a/Classes/Utils/GrowingTextView/HPGrowingTextView.m
+++ b/Classes/Utils/GrowingTextView/HPGrowingTextView.m
@@ -149,7 +149,7 @@
     internalTextView.hidden = NO;
     internalTextView.delegate = self;
     
-    [self sizeToFit];
+    //[self sizeToFit];
     
     maxNumberOfLines = n;
 }
@@ -178,7 +178,7 @@
     internalTextView.hidden = NO;
     internalTextView.delegate = self;
     
-    [self sizeToFit];
+    //[self sizeToFit];
     
     minNumberOfLines = m;
 }
diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m
index c0698ebb1..6dc810dd6 100644
--- a/Classes/WizardViewController.m
+++ b/Classes/WizardViewController.m
@@ -145,10 +145,17 @@ static UICompositeViewDescription *compositeDescription = nil;
                                                object:nil];
 }
 
-
 - (void)viewDidLoad {
     [super viewDidLoad];
-    [WizardViewController adjustFontSize:self.view mult:2.0f];
+    if([LinphoneManager runningOnIpad]) {
+        
+        [WizardViewController adjustFontSize:welcomeView mult:2.22f];
+        [WizardViewController adjustFontSize:choiceView mult:2.22f];
+        [WizardViewController adjustFontSize:createAccountView mult:2.22f];
+        [WizardViewController adjustFontSize:connectAccountView mult:2.22f];
+        [WizardViewController adjustFontSize:externalAccountView mult:2.22f];
+        [WizardViewController adjustFontSize:validateAccountView mult:2.22f];
+    }
 }
 
 
@@ -157,7 +164,12 @@ static UICompositeViewDescription *compositeDescription = nil;
 + (void)adjustFontSize:(UIView*)view mult:(float)mult{
     if([view isKindOfClass:[UILabel class]]) {
         UILabel *label = (UILabel*)view;
-        [label setAdjustsFontSizeToFitWidth:TRUE]; // Not put it in IB: issue with placeholder size
+        UIFont *font = [label font];
+        [label setFont:[UIFont fontWithName:font.fontName size:font.pointSize * mult]];
+    } else if([view isKindOfClass:[UITextField class]]) {
+        UITextField *label = (UITextField*)view;
+        UIFont *font = [label font];
+        [label setFont:[UIFont fontWithName:font.fontName size:font.pointSize * mult]];
     } else {
         for(UIView *subView in [view subviews]) {
             [WizardViewController adjustFontSize:subView mult:mult];
diff --git a/Classes/en.lproj/ChatRoomViewController.xib b/Classes/en.lproj/ChatRoomViewController.xib
index e60678397..7056bfce7 100644
--- a/Classes/en.lproj/ChatRoomViewController.xib
+++ b/Classes/en.lproj/ChatRoomViewController.xib
@@ -267,7 +267,6 @@
 										<string key="NSFrame">{{262, 0}, {58, 57}}</string>
 										<reference key="NSSuperview" ref="833509359"/>
 										<reference key="NSWindow"/>
-										<reference key="NSNextKeyView"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
 										<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -360,7 +359,7 @@
 									<object class="IBUIView" id="587350058">
 										<reference key="NSNextResponder" ref="833509359"/>
 										<int key="NSvFlags">274</int>
-										<string key="NSFrame">{{33, 10}, {232, 37}}</string>
+										<string key="NSFrame">{{39, 12}, {218, 33}}</string>
 										<reference key="NSSuperview" ref="833509359"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="487645621"/>
diff --git a/Classes/en.lproj/ChatViewController.xib b/Classes/en.lproj/ChatViewController.xib
index eabdb3cfa..638433c1b 100644
--- a/Classes/en.lproj/ChatViewController.xib
+++ b/Classes/en.lproj/ChatViewController.xib
@@ -203,8 +203,8 @@
 					</object>
 					<object class="IBUITextField" id="585481821">
 						<reference key="NSNextResponder" ref="1010501960"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{25, 44}, {271, 35}}</string>
+						<int key="NSvFlags">290</int>
+						<string key="NSFrame">{{2, 44}, {316, 35}}</string>
 						<reference key="NSSuperview" ref="1010501960"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="69932958"/>
@@ -234,7 +234,7 @@
 						</object>
 						<object class="NSCustomResource" key="IBUIBackground">
 							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">chat_address.png</string>
+							<string key="NSResourceName">field_background.png</string>
 						</object>
 						<int key="IBUIClearButtonMode">1</int>
 						<object class="IBUIFontDescription" key="IBUIFontDescription">
@@ -439,6 +439,7 @@
 				<real value="1" key="10.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
 				<real value="1" key="10.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="25.CustomClassName">UILinphoneTextField</string>
 				<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="4.CustomClassName">ChatTableViewController</string>
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -507,6 +508,33 @@
 						<string key="minorKey">./Classes/ChatViewController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">TUNinePatch</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TUNinePatch.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILinphoneTextField</string>
+					<string key="superclassName">UITextField</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">backgroundNinePatch</string>
+						<string key="NS.object.0">TUNinePatch</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">backgroundNinePatch</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">backgroundNinePatch</string>
+							<string key="candidateClassName">TUNinePatch</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILinphoneTextField.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">UIToggleButton</string>
 					<string key="superclassName">UIButton</string>
@@ -528,10 +556,10 @@
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<string key="chat_add_default.png">{320, 88}</string>
 			<string key="chat_add_over.png">{320, 88}</string>
-			<string key="chat_address.png">{542, 70}</string>
 			<string key="chat_edit_default.png">{320, 88}</string>
 			<string key="chat_edit_over.png">{320, 88}</string>
 			<string key="chat_ok_default.png">{320, 88}</string>
+			<string key="field_background.png">{542, 88}</string>
 			<string key="toolsbar_background.png">{5, 88}</string>
 		</dictionary>
 		<string key="IBCocoaTouchPluginVersion">1926</string>
diff --git a/Classes/en.lproj/DialerViewController.xib b/Classes/en.lproj/DialerViewController.xib
index ac00637cf..24f5ce0c0 100644
--- a/Classes/en.lproj/DialerViewController.xib
+++ b/Classes/en.lproj/DialerViewController.xib
@@ -51,8 +51,13 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{320, 80}</string>
 								<reference key="NSSuperview" ref="312750714"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="751637181"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<object class="NSColor" key="IBUIBackgroundColor" id="377660437">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwAA</bytes>
+								</object>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								<object class="NSCustomResource" key="IBUIImage">
@@ -65,11 +70,9 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{320, 60}</string>
 								<reference key="NSSuperview" ref="312750714"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="242430033"/>
-								<object class="NSColor" key="IBUIBackgroundColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MSAwAA</bytes>
-								</object>
+								<reference key="IBUIBackgroundColor" ref="377660437"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -104,15 +107,10 @@
 						</object>
 						<string key="NSFrameSize">{320, 80}</string>
 						<reference key="NSSuperview" ref="542426306"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="874403835"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MSAwAA</bytes>
-							<object class="NSColorSpace" key="NSCustomColorSpace" id="415406112">
-								<int key="NSID">2</int>
-							</object>
-						</object>
+						<reference key="IBUIBackgroundColor" ref="377660437"/>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
@@ -126,6 +124,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 11}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="607229252"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@@ -168,6 +167,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 11}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1070392235"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -194,6 +194,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 11}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="539158319"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -220,6 +221,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 73}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="539781036"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -246,6 +248,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 73}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="573280603"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -272,6 +275,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 73}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="150499342"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -298,6 +302,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 135}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="616388880"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -324,6 +329,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 135}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="624378925"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -350,6 +356,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 135}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="465571136"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -376,6 +383,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 197}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="602859574"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -402,6 +410,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 197}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="310945439"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -428,6 +437,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 197}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="32193173"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -452,12 +462,10 @@
 						</object>
 						<string key="NSFrame">{{0, 58}, {320, 260}}</string>
 						<reference key="NSSuperview" ref="542426306"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="201618948"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor" id="377660437">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MCAwAA</bytes>
-						</object>
+						<reference key="IBUIBackgroundColor" ref="377660437"/>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
 					<object class="IBUIView" id="32193173">
@@ -470,6 +478,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{106, 69}</string>
 								<reference key="NSSuperview" ref="32193173"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="617539638"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -506,6 +515,7 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrameSize">{106, 69}</string>
 								<reference key="NSSuperview" ref="32193173"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="749717331"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -538,6 +548,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{106, 0}, {108, 69}}</string>
 								<reference key="NSSuperview" ref="32193173"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="375677999"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -571,6 +582,7 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{106, 0}, {108, 69}}</string>
 								<reference key="NSSuperview" ref="32193173"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="275435271"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -604,6 +616,7 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{106, 0}, {108, 69}}</string>
 								<reference key="NSSuperview" ref="32193173"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="992434254"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -637,6 +650,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{214, 0}, {106, 69}}</string>
 								<reference key="NSSuperview" ref="32193173"/>
+								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -667,18 +681,22 @@
 						</object>
 						<string key="NSFrame">{{0, 305}, {320, 69}}</string>
 						<reference key="NSSuperview" ref="542426306"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="657970815"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MSAwAA</bytes>
-							<reference key="NSCustomColorSpace" ref="415406112"/>
+							<object class="NSColorSpace" key="NSCustomColorSpace">
+								<int key="NSID">2</int>
+							</object>
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
 				</object>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="312750714"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="377660437"/>
@@ -1363,7 +1381,341 @@
 			<nil key="sourceID"/>
 			<int key="maxID">254</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">DialerViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>onAddContactClick:</string>
+							<string>onAddressChange:</string>
+							<string>onBackClick:</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>onAddContactClick:</string>
+							<string>onAddressChange:</string>
+							<string>onBackClick:</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">onAddContactClick:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">onAddressChange:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">onBackClick:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>addCallButton</string>
+							<string>addContactButton</string>
+							<string>addressField</string>
+							<string>backButton</string>
+							<string>backgroundView</string>
+							<string>callButton</string>
+							<string>eightButton</string>
+							<string>eraseButton</string>
+							<string>fiveButton</string>
+							<string>fourButton</string>
+							<string>nineButton</string>
+							<string>oneButton</string>
+							<string>sevenButton</string>
+							<string>sharpButton</string>
+							<string>sixButton</string>
+							<string>starButton</string>
+							<string>threeButton</string>
+							<string>transferButton</string>
+							<string>twoButton</string>
+							<string>videoCameraSwitch</string>
+							<string>videoPreview</string>
+							<string>zeroButton</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>UICallButton</string>
+							<string>UIButton</string>
+							<string>UITextField</string>
+							<string>UIButton</string>
+							<string>UIView</string>
+							<string>UICallButton</string>
+							<string>UIDigitButton</string>
+							<string>UIEraseButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UITransferButton</string>
+							<string>UIDigitButton</string>
+							<string>UICamSwitch</string>
+							<string>UIView</string>
+							<string>UIDigitButton</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>addCallButton</string>
+							<string>addContactButton</string>
+							<string>addressField</string>
+							<string>backButton</string>
+							<string>backgroundView</string>
+							<string>callButton</string>
+							<string>eightButton</string>
+							<string>eraseButton</string>
+							<string>fiveButton</string>
+							<string>fourButton</string>
+							<string>nineButton</string>
+							<string>oneButton</string>
+							<string>sevenButton</string>
+							<string>sharpButton</string>
+							<string>sixButton</string>
+							<string>starButton</string>
+							<string>threeButton</string>
+							<string>transferButton</string>
+							<string>twoButton</string>
+							<string>videoCameraSwitch</string>
+							<string>videoPreview</string>
+							<string>zeroButton</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">addCallButton</string>
+								<string key="candidateClassName">UICallButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">addContactButton</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">addressField</string>
+								<string key="candidateClassName">UITextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">backButton</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">backgroundView</string>
+								<string key="candidateClassName">UIView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">callButton</string>
+								<string key="candidateClassName">UICallButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">eightButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">eraseButton</string>
+								<string key="candidateClassName">UIEraseButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fiveButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fourButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">nineButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">oneButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">sevenButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">sharpButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">sixButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">starButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">threeButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">transferButton</string>
+								<string key="candidateClassName">UITransferButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">twoButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">videoCameraSwitch</string>
+								<string key="candidateClassName">UICamSwitch</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">videoPreview</string>
+								<string key="candidateClassName">UIView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">zeroButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/DialerViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIAddressTextField</string>
+					<string key="superclassName">UITextField</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIAddressTextField.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UICallButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">addressField</string>
+						<string key="NS.object.0">UITextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addressField</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UICallButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UICamSwitch</string>
+					<string key="superclassName">UIButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">preview</string>
+						<string key="NS.object.0">UIView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">preview</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">preview</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UICamSwitch.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIDigitButton</string>
+					<string key="superclassName">UILongTouchButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">addressField</string>
+						<string key="NS.object.0">UITextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addressField</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+					</object>
+					<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">UIEraseButton</string>
+					<string key="superclassName">UILongTouchButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">addressField</string>
+						<string key="NS.object.0">UITextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addressField</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIEraseButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILongTouchButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILongTouchButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UITransferButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">addressField</string>
+						<string key="NS.object.0">UITextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addressField</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UITransferButton.h</string>
+					</object>
+				</object>
+			</object>
+		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
diff --git a/Classes/en.lproj/DialerViewController~ipad.xib b/Classes/en.lproj/DialerViewController~ipad.xib
index ae1c56e6a..9f5148f36 100644
--- a/Classes/en.lproj/DialerViewController~ipad.xib
+++ b/Classes/en.lproj/DialerViewController~ipad.xib
@@ -40,8 +40,9 @@
 					<object class="IBUIImageView" id="422247190">
 						<reference key="NSNextResponder" ref="450916897"/>
 						<int key="NSvFlags">301</int>
-						<string key="NSFrame">{{127, 150}, {510, 460}}</string>
+						<string key="NSFrame">{{127, 200}, {510, 460}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="811328787"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<int key="IBUIContentMode">1</int>
@@ -57,6 +58,7 @@
 						<int key="NSvFlags">301</int>
 						<string key="NSFrame">{{-1000, -1000}, {2768, 2900}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="935083036"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -70,6 +72,7 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{0, 58}, {768, 842}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="857979271"/>
 						<object class="NSColor" key="IBUIBackgroundColor" id="474273757">
 							<int key="NSColorSpace">3</int>
@@ -83,6 +86,7 @@
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{20, 90}, {85, 33}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="422247190"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -120,13 +124,30 @@
 						<reference key="NSNextResponder" ref="450916897"/>
 						<int key="NSvFlags">290</int>
 						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIView" id="885330675">
+								<reference key="NSNextResponder" ref="935083036"/>
+								<int key="NSvFlags">290</int>
+								<string key="NSFrame">{{0, -2000}, {768, 2000}}</string>
+								<reference key="NSSuperview" ref="935083036"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="33995646"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<object class="NSColor" key="IBUIBackgroundColor">
+									<int key="NSColorSpace">1</int>
+									<bytes key="NSRGB">MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA</bytes>
+								</object>
+								<int key="IBUITag">28</int>
+								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+							</object>
 							<object class="IBUIImageView" id="33995646">
 								<reference key="NSNextResponder" ref="935083036"/>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{768, 80}</string>
 								<reference key="NSSuperview" ref="935083036"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="770143841"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<reference key="IBUIBackgroundColor" ref="474273757"/>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 								<object class="NSCustomResource" key="IBUIImage">
@@ -139,11 +160,9 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{700, 60}</string>
 								<reference key="NSSuperview" ref="935083036"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1069606219"/>
-								<object class="NSColor" key="IBUIBackgroundColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MSAwAA</bytes>
-								</object>
+								<reference key="IBUIBackgroundColor" ref="474273757"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -180,6 +199,7 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{698, 4}, {70, 51}}</string>
 								<reference key="NSSuperview" ref="935083036"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="820868226"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -215,16 +235,10 @@
 						</array>
 						<string key="NSFrameSize">{768, 80}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSNextKeyView" ref="33995646"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="885330675"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MSAwAA</bytes>
-							<object class="NSColorSpace" key="NSCustomColorSpace" id="691271921">
-								<int key="NSID">2</int>
-							</object>
-						</object>
-						<bool key="IBUIClipsSubviews">YES</bool>
+						<reference key="IBUIBackgroundColor" ref="474273757"/>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 					</object>
 					<object class="IBUIView" id="811328787">
@@ -236,6 +250,7 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{320, 280}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="257730270"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">2</int>
@@ -251,6 +266,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 11}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="579980565"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@@ -286,6 +302,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 11}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="534491605"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -312,6 +329,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 11}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="405606838"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -338,6 +356,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 73}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="984444210"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -364,6 +383,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 73}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="505513327"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -390,6 +410,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 73}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="829692929"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -416,6 +437,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 135}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="430965229"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -442,6 +464,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 135}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="565116665"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -468,6 +491,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 135}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="47810246"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -494,6 +518,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 197}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="776264615"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -520,6 +545,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 197}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="718499319"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -546,6 +572,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 197}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="683359487"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -570,6 +597,7 @@
 						</array>
 						<string key="NSFrame">{{0, 640}, {320, 260}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="848268216"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="474273757"/>
@@ -584,6 +612,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{126, 85}</string>
 								<reference key="NSSuperview" ref="683359487"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="405746031"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -617,6 +646,7 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrameSize">{126, 85}</string>
 								<reference key="NSSuperview" ref="683359487"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="981547916"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -649,6 +679,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{126, 0}, {186, 85}}</string>
 								<reference key="NSSuperview" ref="683359487"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="514058756"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -682,6 +713,7 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{126, 0}, {186, 85}}</string>
 								<reference key="NSSuperview" ref="683359487"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1043651254"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -715,6 +747,8 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{126, 0}, {186, 85}}</string>
 								<reference key="NSSuperview" ref="683359487"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -745,18 +779,22 @@
 						</array>
 						<string key="NSFrame">{{456, 815}, {312, 85}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="169100052"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MSAwAA</bytes>
-							<reference key="NSCustomColorSpace" ref="691271921"/>
+							<object class="NSColorSpace" key="NSCustomColorSpace">
+								<int key="NSID">2</int>
+							</object>
 						</object>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 					</object>
 				</array>
 				<string key="NSFrameSize">{768, 900}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="887694290"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="474273757"/>
@@ -1187,6 +1225,7 @@
 							<reference ref="770143841"/>
 							<reference ref="33995646"/>
 							<reference ref="1069606219"/>
+							<reference ref="885330675"/>
 						</array>
 						<reference key="parent" ref="450916897"/>
 						<string key="objectName">dialer</string>
@@ -1342,6 +1381,12 @@
 						<reference key="parent" ref="450916897"/>
 						<string key="objectName">preview</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">79</int>
+						<reference key="object" ref="885330675"/>
+						<reference key="parent" ref="935083036"/>
+						<string key="objectName">background</string>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1410,6 +1455,7 @@
 				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="76.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="78.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.CustomClassName">UIDigitButton</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="8.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
@@ -1421,7 +1467,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">78</int>
+			<int key="maxID">79</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/Classes/en.lproj/WizardViewController.xib b/Classes/en.lproj/WizardViewController.xib
index f01b4bf29..19ddd7f5d 100644
--- a/Classes/en.lproj/WizardViewController.xib
+++ b/Classes/en.lproj/WizardViewController.xib
@@ -152,7 +152,6 @@
 								<int key="NSvFlags">-2147483357</int>
 								<string key="NSFrame">{{160, 0}, {160, 77}}</string>
 								<reference key="NSSuperview" ref="1057285194"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<int key="IBUITag">5</int>
diff --git a/Classes/en.lproj/WizardViewController~ipad.xib b/Classes/en.lproj/WizardViewController~ipad.xib
index d3414692d..0b2e69b39 100644
--- a/Classes/en.lproj/WizardViewController~ipad.xib
+++ b/Classes/en.lproj/WizardViewController~ipad.xib
@@ -42,7 +42,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrameSize">{768, 966}</string>
 						<reference key="NSSuperview" ref="770392660"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="62439358"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -61,7 +60,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 77}, {768, 2000}}</string>
 								<reference key="NSSuperview" ref="1057285194"/>
-								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@@ -75,7 +73,6 @@
 								<int key="NSvFlags">294</int>
 								<string key="NSFrameSize">{384, 77}</string>
 								<reference key="NSSuperview" ref="1057285194"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="237722854"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -132,7 +129,6 @@
 								<int key="NSvFlags">291</int>
 								<string key="NSFrame">{{384, 0}, {384, 77}}</string>
 								<reference key="NSSuperview" ref="1057285194"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="483101671"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -169,7 +165,6 @@
 								<int key="NSvFlags">-2147483357</int>
 								<string key="NSFrame">{{384, 0}, {384, 77}}</string>
 								<reference key="NSSuperview" ref="1057285194"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="938095663"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -208,7 +203,6 @@
 						</array>
 						<string key="NSFrame">{{0, 947}, {768, 77}}</string>
 						<reference key="NSSuperview" ref="770392660"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="954353386"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor" id="981989056">
@@ -227,7 +221,6 @@
 								<int key="NSvFlags">301</int>
 								<string key="NSFrame">{{366, 492}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="62439358"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1057285194"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -240,7 +233,6 @@
 						</array>
 						<string key="NSFrameSize">{768, 1024}</string>
 						<reference key="NSSuperview" ref="770392660"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="41091084"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -253,7 +245,6 @@
 				</array>
 				<string key="NSFrameSize">{768, 1024}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="1004767347"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="981989056"/>
@@ -268,7 +259,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrameSize">{1024, 711}</string>
 						<reference key="NSSuperview" ref="298371011"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1066982838"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -287,7 +277,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 77}, {1024, 2000}}</string>
 								<reference key="NSSuperview" ref="880278922"/>
-								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@@ -301,7 +290,6 @@
 								<int key="NSvFlags">294</int>
 								<string key="NSFrameSize">{512, 77}</string>
 								<reference key="NSSuperview" ref="880278922"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1028981026"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -348,7 +336,6 @@
 								<int key="NSvFlags">291</int>
 								<string key="NSFrame">{{512, 0}, {512, 77}}</string>
 								<reference key="NSSuperview" ref="880278922"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="351442668"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -385,7 +372,6 @@
 								<int key="NSvFlags">-2147483357</int>
 								<string key="NSFrame">{{512, 0}, {512, 77}}</string>
 								<reference key="NSSuperview" ref="880278922"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="91020530"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -424,7 +410,6 @@
 						</array>
 						<string key="NSFrame">{{0, 691}, {1024, 77}}</string>
 						<reference key="NSSuperview" ref="298371011"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="378153891"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="981989056"/>
@@ -440,7 +425,6 @@
 								<int key="NSvFlags">301</int>
 								<string key="NSFrame">{{494, 364}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="1066982838"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="880278922"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -453,7 +437,6 @@
 						</array>
 						<string key="NSFrameSize">{1024, 768}</string>
 						<reference key="NSSuperview" ref="298371011"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="102198390"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -466,7 +449,6 @@
 				</array>
 				<string key="NSFrameSize">{1024, 768}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="630762107"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="981989056"/>
@@ -785,148 +767,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">137</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">TPMultiLayoutViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="landscapeView">UIView</string>
-						<string key="portraitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="landscapeView">
-							<string key="name">landscapeView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="portraitView">
-							<string key="name">portraitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">WizardViewController</string>
-					<string key="superclassName">TPMultiLayoutViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onBackClick:">id</string>
-						<string key="onCancelClick:">id</string>
-						<string key="onCheckValidationClick:">id</string>
-						<string key="onConnectAccountClick:">id</string>
-						<string key="onCreateAccountClick:">id</string>
-						<string key="onExternalAccountClick:">id</string>
-						<string key="onRegisterClick:">id</string>
-						<string key="onSignInClick:">id</string>
-						<string key="onSignInExternalClick:">id</string>
-						<string key="onStartClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onBackClick:">
-							<string key="name">onBackClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onCancelClick:">
-							<string key="name">onCancelClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onCheckValidationClick:">
-							<string key="name">onCheckValidationClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onConnectAccountClick:">
-							<string key="name">onConnectAccountClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onCreateAccountClick:">
-							<string key="name">onCreateAccountClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onExternalAccountClick:">
-							<string key="name">onExternalAccountClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onRegisterClick:">
-							<string key="name">onRegisterClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onSignInClick:">
-							<string key="name">onSignInClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onSignInExternalClick:">
-							<string key="name">onSignInExternalClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onStartClick:">
-							<string key="name">onStartClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="backButton">UIButton</string>
-						<string key="choiceView">UIView</string>
-						<string key="connectAccountView">UIView</string>
-						<string key="contentView">UIScrollView</string>
-						<string key="createAccountView">UIView</string>
-						<string key="externalAccountView">UIView</string>
-						<string key="startButton">UIButton</string>
-						<string key="validateAccountView">UIView</string>
-						<string key="waitView">UIView</string>
-						<string key="welcomeView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="backButton">
-							<string key="name">backButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="choiceView">
-							<string key="name">choiceView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="connectAccountView">
-							<string key="name">connectAccountView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="contentView">
-							<string key="name">contentView</string>
-							<string key="candidateClassName">UIScrollView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="createAccountView">
-							<string key="name">createAccountView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="externalAccountView">
-							<string key="name">externalAccountView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="startButton">
-							<string key="name">startButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="validateAccountView">
-							<string key="name">validateAccountView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="waitView">
-							<string key="name">waitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="welcomeView">
-							<string key="name">welcomeView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/WizardViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
diff --git a/Classes/en.lproj/WizardViews.xib b/Classes/en.lproj/WizardViews.xib
index 00a8b25a5..3c21a990c 100644
--- a/Classes/en.lproj/WizardViews.xib
+++ b/Classes/en.lproj/WizardViews.xib
@@ -44,7 +44,7 @@
 						<string key="NSFrame">{{60, 80}, {201, 129}}</string>
 						<reference key="NSSuperview" ref="741268807"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="265601557"/>
+						<reference key="NSNextKeyView" ref="225959176"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<int key="IBUIContentMode">1</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -60,11 +60,11 @@
 					</object>
 					<object class="IBUILabel" id="225959176">
 						<reference key="NSNextResponder" ref="741268807"/>
-						<int key="NSvFlags">311</int>
+						<int key="NSvFlags">319</int>
 						<string key="NSFrame">{{31, 230}, {258, 40}}</string>
 						<reference key="NSSuperview" ref="741268807"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="462684684"/>
+						<reference key="NSNextKeyView" ref="265601557"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -134,7 +134,7 @@
 				<string key="NSFrameSize">{320, 394}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="225959176"/>
+				<reference key="NSNextKeyView" ref="462684684"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor" id="981989056">
 					<int key="NSColorSpace">3</int>
@@ -314,7 +314,7 @@
 					</object>
 					<object class="IBUILabel" id="696113137">
 						<reference key="NSNextResponder" ref="183617546"/>
-						<int key="NSvFlags">298</int>
+						<int key="NSvFlags">314</int>
 						<string key="NSFrame">{{39, 80}, {240, 44}}</string>
 						<reference key="NSSuperview" ref="183617546"/>
 						<reference key="NSWindow"/>
@@ -553,7 +553,7 @@
 					</object>
 					<object class="IBUILabel" id="391450353">
 						<reference key="NSNextResponder" ref="101753691"/>
-						<int key="NSvFlags">298</int>
+						<int key="NSvFlags">314</int>
 						<string key="NSFrame">{{40, 80}, {240, 44}}</string>
 						<reference key="NSSuperview" ref="101753691"/>
 						<reference key="NSWindow"/>
@@ -708,7 +708,7 @@
 					</object>
 					<object class="IBUILabel" id="923226743">
 						<reference key="NSNextResponder" ref="71390966"/>
-						<int key="NSvFlags">298</int>
+						<int key="NSvFlags">314</int>
 						<string key="NSFrame">{{40, 80}, {240, 44}}</string>
 						<reference key="NSSuperview" ref="71390966"/>
 						<reference key="NSWindow"/>
@@ -895,7 +895,7 @@
 					</object>
 					<object class="IBUILabel" id="100756849">
 						<reference key="NSNextResponder" ref="611643284"/>
-						<int key="NSvFlags">298</int>
+						<int key="NSvFlags">314</int>
 						<string key="NSFrame">{{40, 80}, {240, 44}}</string>
 						<reference key="NSSuperview" ref="611643284"/>
 						<reference key="NSWindow"/>
@@ -1505,10 +1505,13 @@
 				<string key="-2.CustomClassName">UIResponder</string>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="101.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="103.CustomClassName">UILinphoneButton</string>
 				<string key="103.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="103.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="104.CustomClassName">UILinphoneTextField</string>
 				<string key="104.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="105.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="106.CustomClassName">UILinphoneTextField</string>
 				<string key="106.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="117.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="122.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -1520,32 +1523,46 @@
 				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="33.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="36.CustomClassName">UILinphoneButton</string>
 				<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="1" key="36.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="38.CustomClassName">UILinphoneButton</string>
 				<string key="38.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="1" key="38.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="39.CustomClassName">UILinphoneButton</string>
 				<string key="39.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="1" key="39.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="44.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="52.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="59.CustomClassName">UILinphoneTextField</string>
 				<string key="59.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="60.CustomClassName">UILinphoneTextField</string>
 				<string key="60.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="61.CustomClassName">UILinphoneTextField</string>
 				<string key="61.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="62.CustomClassName">UILinphoneButton</string>
 				<string key="62.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="62.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="64.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="64.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="66.CustomClassName">UILinphoneTextField</string>
 				<string key="66.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="67.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="68.CustomClassName">UILinphoneTextField</string>
 				<string key="68.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="74.CustomClassName">UILinphoneTextField</string>
 				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="75.CustomClassName">UILinphoneTextField</string>
 				<string key="75.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="76.CustomClassName">UILinphoneTextField</string>
 				<string key="76.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="77.CustomClassName">UILinphoneButton</string>
 				<string key="77.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="77.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="79.CustomClassName">UILinphoneTextField</string>
 				<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
@@ -1578,6 +1595,55 @@
 						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">TUNinePatch</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TUNinePatch.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILinphoneButton</string>
+					<string key="superclassName">UIButton</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="backgroundNinePatch">TUNinePatch</string>
+						<string key="backgroundOverNinePatch">TUNinePatch</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="backgroundNinePatch">
+							<string key="name">backgroundNinePatch</string>
+							<string key="candidateClassName">TUNinePatch</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="backgroundOverNinePatch">
+							<string key="name">backgroundOverNinePatch</string>
+							<string key="candidateClassName">TUNinePatch</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILinphoneButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILinphoneTextField</string>
+					<string key="superclassName">UITextField</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">backgroundNinePatch</string>
+						<string key="NS.object.0">TUNinePatch</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">backgroundNinePatch</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">backgroundNinePatch</string>
+							<string key="candidateClassName">TUNinePatch</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILinphoneTextField.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">WizardViewController</string>
 					<string key="superclassName">TPMultiLayoutViewController</string>
diff --git a/Classes/fr.lproj/ChatRoomViewController.xib b/Classes/fr.lproj/ChatRoomViewController.xib
index ceff4af70..75fe63822 100644
--- a/Classes/fr.lproj/ChatRoomViewController.xib
+++ b/Classes/fr.lproj/ChatRoomViewController.xib
@@ -347,7 +347,7 @@
 									<object class="IBUIView" id="587350058">
 										<reference key="NSNextResponder" ref="833509359"/>
 										<int key="NSvFlags">274</int>
-										<string key="NSFrame">{{33, 10}, {232, 37}}</string>
+										<string key="NSFrame">{{39, 12}, {218, 33}}</string>
 										<reference key="NSSuperview" ref="833509359"/>
 										<reference key="NSNextKeyView" ref="487645621"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
diff --git a/Classes/fr.lproj/ChatViewController.xib b/Classes/fr.lproj/ChatViewController.xib
index 679701ddf..ebdcaca48 100644
--- a/Classes/fr.lproj/ChatViewController.xib
+++ b/Classes/fr.lproj/ChatViewController.xib
@@ -198,8 +198,8 @@
 					</object>
 					<object class="IBUITextField" id="585481821">
 						<reference key="NSNextResponder" ref="1010501960"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{25, 44}, {271, 35}}</string>
+						<int key="NSvFlags">290</int>
+						<string key="NSFrame">{{2, 44}, {316, 35}}</string>
 						<reference key="NSSuperview" ref="1010501960"/>
 						<reference key="NSNextKeyView" ref="69932958"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -228,7 +228,7 @@
 						</object>
 						<object class="NSCustomResource" key="IBUIBackground">
 							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">chat_address.png</string>
+							<string key="NSResourceName">field_background.png</string>
 						</object>
 						<int key="IBUIClearButtonMode">1</int>
 						<object class="IBUIFontDescription" key="IBUIFontDescription">
@@ -431,6 +431,7 @@
 				<real value="1" key="10.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
 				<real value="1" key="10.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="25.CustomClassName">UILinphoneTextField</string>
 				<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="4.CustomClassName">ChatTableViewController</string>
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -499,6 +500,33 @@
 						<string key="minorKey">./Classes/ChatViewController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">TUNinePatch</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TUNinePatch.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILinphoneTextField</string>
+					<string key="superclassName">UITextField</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">backgroundNinePatch</string>
+						<string key="NS.object.0">TUNinePatch</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">backgroundNinePatch</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">backgroundNinePatch</string>
+							<string key="candidateClassName">TUNinePatch</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILinphoneTextField.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">UIToggleButton</string>
 					<string key="superclassName">UIButton</string>
@@ -520,10 +548,10 @@
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<string key="chat_add_default.png">{320, 88}</string>
 			<string key="chat_add_over.png">{320, 88}</string>
-			<string key="chat_address.png">{542, 70}</string>
 			<string key="chat_edit_default.png">{320, 88}</string>
 			<string key="chat_edit_over.png">{320, 88}</string>
 			<string key="chat_ok_default.png">{320, 88}</string>
+			<string key="field_background.png">{542, 88}</string>
 			<string key="toolsbar_background.png">{5, 88}</string>
 		</dictionary>
 		<string key="IBCocoaTouchPluginVersion">933</string>
diff --git a/Classes/fr.lproj/DialerViewController.xib b/Classes/fr.lproj/DialerViewController.xib
index c0ef305a4..9dd198e01 100644
--- a/Classes/fr.lproj/DialerViewController.xib
+++ b/Classes/fr.lproj/DialerViewController.xib
@@ -53,6 +53,10 @@
 								<reference key="NSSuperview" ref="312750714"/>
 								<reference key="NSNextKeyView" ref="751637181"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<object class="NSColor" key="IBUIBackgroundColor" id="377660437">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwAA</bytes>
+								</object>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								<object class="NSCustomResource" key="IBUIImage">
@@ -66,10 +70,7 @@
 								<string key="NSFrameSize">{320, 60}</string>
 								<reference key="NSSuperview" ref="312750714"/>
 								<reference key="NSNextKeyView" ref="242430033"/>
-								<object class="NSColor" key="IBUIBackgroundColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MSAwAA</bytes>
-								</object>
+								<reference key="IBUIBackgroundColor" ref="377660437"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -106,13 +107,7 @@
 						<reference key="NSSuperview" ref="542426306"/>
 						<reference key="NSNextKeyView" ref="874403835"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MSAwAA</bytes>
-							<object class="NSColorSpace" key="NSCustomColorSpace" id="415406112">
-								<int key="NSID">2</int>
-							</object>
-						</object>
+						<reference key="IBUIBackgroundColor" ref="377660437"/>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
@@ -454,10 +449,7 @@
 						<reference key="NSSuperview" ref="542426306"/>
 						<reference key="NSNextKeyView" ref="201618948"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor" id="377660437">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MCAwAA</bytes>
-						</object>
+						<reference key="IBUIBackgroundColor" ref="377660437"/>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
 					<object class="IBUIView" id="32193173">
@@ -672,7 +664,9 @@
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MSAwAA</bytes>
-							<reference key="NSCustomColorSpace" ref="415406112"/>
+							<object class="NSColorSpace" key="NSCustomColorSpace">
+								<int key="NSID">2</int>
+							</object>
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
@@ -1362,7 +1356,341 @@
 			<nil key="sourceID"/>
 			<int key="maxID">254</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">DialerViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>onAddContactClick:</string>
+							<string>onAddressChange:</string>
+							<string>onBackClick:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>onAddContactClick:</string>
+							<string>onAddressChange:</string>
+							<string>onBackClick:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">onAddContactClick:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">onAddressChange:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">onBackClick:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>addCallButton</string>
+							<string>addContactButton</string>
+							<string>addressField</string>
+							<string>backButton</string>
+							<string>backgroundView</string>
+							<string>callButton</string>
+							<string>eightButton</string>
+							<string>eraseButton</string>
+							<string>fiveButton</string>
+							<string>fourButton</string>
+							<string>nineButton</string>
+							<string>oneButton</string>
+							<string>sevenButton</string>
+							<string>sharpButton</string>
+							<string>sixButton</string>
+							<string>starButton</string>
+							<string>threeButton</string>
+							<string>transferButton</string>
+							<string>twoButton</string>
+							<string>videoCameraSwitch</string>
+							<string>videoPreview</string>
+							<string>zeroButton</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>UICallButton</string>
+							<string>UIButton</string>
+							<string>UITextField</string>
+							<string>UIButton</string>
+							<string>UIView</string>
+							<string>UICallButton</string>
+							<string>UIDigitButton</string>
+							<string>UIEraseButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UITransferButton</string>
+							<string>UIDigitButton</string>
+							<string>UICamSwitch</string>
+							<string>UIView</string>
+							<string>UIDigitButton</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>addCallButton</string>
+							<string>addContactButton</string>
+							<string>addressField</string>
+							<string>backButton</string>
+							<string>backgroundView</string>
+							<string>callButton</string>
+							<string>eightButton</string>
+							<string>eraseButton</string>
+							<string>fiveButton</string>
+							<string>fourButton</string>
+							<string>nineButton</string>
+							<string>oneButton</string>
+							<string>sevenButton</string>
+							<string>sharpButton</string>
+							<string>sixButton</string>
+							<string>starButton</string>
+							<string>threeButton</string>
+							<string>transferButton</string>
+							<string>twoButton</string>
+							<string>videoCameraSwitch</string>
+							<string>videoPreview</string>
+							<string>zeroButton</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">addCallButton</string>
+								<string key="candidateClassName">UICallButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">addContactButton</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">addressField</string>
+								<string key="candidateClassName">UITextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">backButton</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">backgroundView</string>
+								<string key="candidateClassName">UIView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">callButton</string>
+								<string key="candidateClassName">UICallButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">eightButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">eraseButton</string>
+								<string key="candidateClassName">UIEraseButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fiveButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fourButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">nineButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">oneButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">sevenButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">sharpButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">sixButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">starButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">threeButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">transferButton</string>
+								<string key="candidateClassName">UITransferButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">twoButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">videoCameraSwitch</string>
+								<string key="candidateClassName">UICamSwitch</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">videoPreview</string>
+								<string key="candidateClassName">UIView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">zeroButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/DialerViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIAddressTextField</string>
+					<string key="superclassName">UITextField</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIAddressTextField.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UICallButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">addressField</string>
+						<string key="NS.object.0">UITextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addressField</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UICallButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UICamSwitch</string>
+					<string key="superclassName">UIButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">preview</string>
+						<string key="NS.object.0">UIView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">preview</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">preview</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UICamSwitch.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIDigitButton</string>
+					<string key="superclassName">UILongTouchButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">addressField</string>
+						<string key="NS.object.0">UITextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addressField</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+					</object>
+					<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">UIEraseButton</string>
+					<string key="superclassName">UILongTouchButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">addressField</string>
+						<string key="NS.object.0">UITextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addressField</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIEraseButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILongTouchButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILongTouchButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UITransferButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">addressField</string>
+						<string key="NS.object.0">UITextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addressField</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UITransferButton.h</string>
+					</object>
+				</object>
+			</object>
+		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
diff --git a/Classes/fr.lproj/DialerViewController~ipad.xib b/Classes/fr.lproj/DialerViewController~ipad.xib
index fde581ced..577478353 100644
--- a/Classes/fr.lproj/DialerViewController~ipad.xib
+++ b/Classes/fr.lproj/DialerViewController~ipad.xib
@@ -40,7 +40,7 @@
 					<object class="IBUIImageView" id="422247190">
 						<reference key="NSNextResponder" ref="450916897"/>
 						<int key="NSvFlags">301</int>
-						<string key="NSFrame">{{127, 150}, {510, 460}}</string>
+						<string key="NSFrame">{{127, 200}, {510, 460}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
 						<reference key="NSNextKeyView" ref="811328787"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -120,6 +120,20 @@
 						<reference key="NSNextResponder" ref="450916897"/>
 						<int key="NSvFlags">290</int>
 						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIView" id="885330675">
+								<reference key="NSNextResponder" ref="935083036"/>
+								<int key="NSvFlags">290</int>
+								<string key="NSFrame">{{0, -2000}, {768, 2000}}</string>
+								<reference key="NSSuperview" ref="935083036"/>
+								<reference key="NSNextKeyView" ref="33995646"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<object class="NSColor" key="IBUIBackgroundColor">
+									<int key="NSColorSpace">1</int>
+									<bytes key="NSRGB">MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA</bytes>
+								</object>
+								<int key="IBUITag">28</int>
+								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+							</object>
 							<object class="IBUIImageView" id="33995646">
 								<reference key="NSNextResponder" ref="935083036"/>
 								<int key="NSvFlags">290</int>
@@ -127,6 +141,7 @@
 								<reference key="NSSuperview" ref="935083036"/>
 								<reference key="NSNextKeyView" ref="770143841"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<reference key="IBUIBackgroundColor" ref="474273757"/>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 								<object class="NSCustomResource" key="IBUIImage">
@@ -140,10 +155,7 @@
 								<string key="NSFrameSize">{700, 60}</string>
 								<reference key="NSSuperview" ref="935083036"/>
 								<reference key="NSNextKeyView" ref="1069606219"/>
-								<object class="NSColor" key="IBUIBackgroundColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MSAwAA</bytes>
-								</object>
+								<reference key="IBUIBackgroundColor" ref="474273757"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -215,16 +227,9 @@
 						</array>
 						<string key="NSFrameSize">{768, 80}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSNextKeyView" ref="33995646"/>
+						<reference key="NSNextKeyView" ref="885330675"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MSAwAA</bytes>
-							<object class="NSColorSpace" key="NSCustomColorSpace" id="691271921">
-								<int key="NSID">2</int>
-							</object>
-						</object>
-						<bool key="IBUIClipsSubviews">YES</bool>
+						<reference key="IBUIBackgroundColor" ref="474273757"/>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 					</object>
 					<object class="IBUIView" id="811328787">
@@ -750,7 +755,9 @@
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MSAwAA</bytes>
-							<reference key="NSCustomColorSpace" ref="691271921"/>
+							<object class="NSColorSpace" key="NSCustomColorSpace">
+								<int key="NSID">2</int>
+							</object>
 						</object>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 					</object>
@@ -1186,6 +1193,7 @@
 							<reference ref="770143841"/>
 							<reference ref="33995646"/>
 							<reference ref="1069606219"/>
+							<reference ref="885330675"/>
 						</array>
 						<reference key="parent" ref="450916897"/>
 						<string key="objectName">dialer</string>
@@ -1341,6 +1349,12 @@
 						<reference key="parent" ref="450916897"/>
 						<string key="objectName">preview</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">79</int>
+						<reference key="object" ref="885330675"/>
+						<reference key="parent" ref="935083036"/>
+						<string key="objectName">background</string>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1409,6 +1423,7 @@
 				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="76.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="78.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.CustomClassName">UIDigitButton</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="8.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
@@ -1420,7 +1435,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">78</int>
+			<int key="maxID">79</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/Classes/fr.lproj/WizardViewController~ipad.xib b/Classes/fr.lproj/WizardViewController~ipad.xib
index fe71f3244..97bad9d75 100644
--- a/Classes/fr.lproj/WizardViewController~ipad.xib
+++ b/Classes/fr.lproj/WizardViewController~ipad.xib
@@ -765,148 +765,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">137</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">TPMultiLayoutViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="landscapeView">UIView</string>
-						<string key="portraitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="landscapeView">
-							<string key="name">landscapeView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="portraitView">
-							<string key="name">portraitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">WizardViewController</string>
-					<string key="superclassName">TPMultiLayoutViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onBackClick:">id</string>
-						<string key="onCancelClick:">id</string>
-						<string key="onCheckValidationClick:">id</string>
-						<string key="onConnectAccountClick:">id</string>
-						<string key="onCreateAccountClick:">id</string>
-						<string key="onExternalAccountClick:">id</string>
-						<string key="onRegisterClick:">id</string>
-						<string key="onSignInClick:">id</string>
-						<string key="onSignInExternalClick:">id</string>
-						<string key="onStartClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onBackClick:">
-							<string key="name">onBackClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onCancelClick:">
-							<string key="name">onCancelClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onCheckValidationClick:">
-							<string key="name">onCheckValidationClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onConnectAccountClick:">
-							<string key="name">onConnectAccountClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onCreateAccountClick:">
-							<string key="name">onCreateAccountClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onExternalAccountClick:">
-							<string key="name">onExternalAccountClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onRegisterClick:">
-							<string key="name">onRegisterClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onSignInClick:">
-							<string key="name">onSignInClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onSignInExternalClick:">
-							<string key="name">onSignInExternalClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onStartClick:">
-							<string key="name">onStartClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="backButton">UIButton</string>
-						<string key="choiceView">UIView</string>
-						<string key="connectAccountView">UIView</string>
-						<string key="contentView">UIScrollView</string>
-						<string key="createAccountView">UIView</string>
-						<string key="externalAccountView">UIView</string>
-						<string key="startButton">UIButton</string>
-						<string key="validateAccountView">UIView</string>
-						<string key="waitView">UIView</string>
-						<string key="welcomeView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="backButton">
-							<string key="name">backButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="choiceView">
-							<string key="name">choiceView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="connectAccountView">
-							<string key="name">connectAccountView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="contentView">
-							<string key="name">contentView</string>
-							<string key="candidateClassName">UIScrollView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="createAccountView">
-							<string key="name">createAccountView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="externalAccountView">
-							<string key="name">externalAccountView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="startButton">
-							<string key="name">startButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="validateAccountView">
-							<string key="name">validateAccountView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="waitView">
-							<string key="name">waitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="welcomeView">
-							<string key="name">welcomeView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/WizardViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
diff --git a/Classes/fr.lproj/WizardViews.xib b/Classes/fr.lproj/WizardViews.xib
index 5075b9f5e..44020e50f 100644
--- a/Classes/fr.lproj/WizardViews.xib
+++ b/Classes/fr.lproj/WizardViews.xib
@@ -43,7 +43,7 @@
 						<int key="NSvFlags">311</int>
 						<string key="NSFrame">{{60, 80}, {201, 129}}</string>
 						<reference key="NSSuperview" ref="741268807"/>
-						<reference key="NSNextKeyView" ref="265601557"/>
+						<reference key="NSNextKeyView" ref="225959176"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<int key="IBUIContentMode">1</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -59,10 +59,10 @@
 					</object>
 					<object class="IBUILabel" id="225959176">
 						<reference key="NSNextResponder" ref="741268807"/>
-						<int key="NSvFlags">311</int>
+						<int key="NSvFlags">319</int>
 						<string key="NSFrame">{{31, 230}, {258, 40}}</string>
 						<reference key="NSSuperview" ref="741268807"/>
-						<reference key="NSNextKeyView" ref="462684684"/>
+						<reference key="NSNextKeyView" ref="265601557"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -127,7 +127,7 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{320, 394}</string>
-				<reference key="NSNextKeyView" ref="225959176"/>
+				<reference key="NSNextKeyView" ref="462684684"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor" id="981989056">
 					<int key="NSColorSpace">3</int>
@@ -300,7 +300,7 @@
 					</object>
 					<object class="IBUILabel" id="696113137">
 						<reference key="NSNextResponder" ref="183617546"/>
-						<int key="NSvFlags">298</int>
+						<int key="NSvFlags">314</int>
 						<string key="NSFrame">{{39, 80}, {240, 44}}</string>
 						<reference key="NSSuperview" ref="183617546"/>
 						<reference key="NSNextKeyView" ref="832238181"/>
@@ -529,7 +529,7 @@
 					</object>
 					<object class="IBUILabel" id="391450353">
 						<reference key="NSNextResponder" ref="101753691"/>
-						<int key="NSvFlags">298</int>
+						<int key="NSvFlags">314</int>
 						<string key="NSFrame">{{40, 80}, {240, 44}}</string>
 						<reference key="NSSuperview" ref="101753691"/>
 						<reference key="NSNextKeyView" ref="280076734"/>
@@ -676,7 +676,7 @@
 					</object>
 					<object class="IBUILabel" id="923226743">
 						<reference key="NSNextResponder" ref="71390966"/>
-						<int key="NSvFlags">298</int>
+						<int key="NSvFlags">314</int>
 						<string key="NSFrame">{{40, 80}, {240, 44}}</string>
 						<reference key="NSSuperview" ref="71390966"/>
 						<reference key="NSNextKeyView" ref="709333986"/>
@@ -854,7 +854,7 @@
 					</object>
 					<object class="IBUILabel" id="100756849">
 						<reference key="NSNextResponder" ref="611643284"/>
-						<int key="NSvFlags">298</int>
+						<int key="NSvFlags">314</int>
 						<string key="NSFrame">{{40, 80}, {240, 44}}</string>
 						<reference key="NSSuperview" ref="611643284"/>
 						<reference key="NSNextKeyView" ref="948938816"/>
@@ -1457,10 +1457,13 @@
 				<string key="-2.CustomClassName">UIResponder</string>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="101.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="103.CustomClassName">UILinphoneButton</string>
 				<string key="103.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="103.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="104.CustomClassName">UILinphoneTextField</string>
 				<string key="104.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="105.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="106.CustomClassName">UILinphoneTextField</string>
 				<string key="106.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="117.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="122.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -1472,32 +1475,46 @@
 				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="33.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="36.CustomClassName">UILinphoneButton</string>
 				<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="1" key="36.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="38.CustomClassName">UILinphoneButton</string>
 				<string key="38.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="1" key="38.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="39.CustomClassName">UILinphoneButton</string>
 				<string key="39.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="1" key="39.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="44.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="52.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="59.CustomClassName">UILinphoneTextField</string>
 				<string key="59.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="60.CustomClassName">UILinphoneTextField</string>
 				<string key="60.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="61.CustomClassName">UILinphoneTextField</string>
 				<string key="61.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="62.CustomClassName">UILinphoneButton</string>
 				<string key="62.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="62.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="64.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="64.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="66.CustomClassName">UILinphoneTextField</string>
 				<string key="66.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="67.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="68.CustomClassName">UILinphoneTextField</string>
 				<string key="68.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="74.CustomClassName">UILinphoneTextField</string>
 				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="75.CustomClassName">UILinphoneTextField</string>
 				<string key="75.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="76.CustomClassName">UILinphoneTextField</string>
 				<string key="76.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="77.CustomClassName">UILinphoneButton</string>
 				<string key="77.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="77.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="79.CustomClassName">UILinphoneTextField</string>
 				<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
@@ -1530,6 +1547,55 @@
 						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">TUNinePatch</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TUNinePatch.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILinphoneButton</string>
+					<string key="superclassName">UIButton</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="backgroundNinePatch">TUNinePatch</string>
+						<string key="backgroundOverNinePatch">TUNinePatch</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="backgroundNinePatch">
+							<string key="name">backgroundNinePatch</string>
+							<string key="candidateClassName">TUNinePatch</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="backgroundOverNinePatch">
+							<string key="name">backgroundOverNinePatch</string>
+							<string key="candidateClassName">TUNinePatch</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILinphoneButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILinphoneTextField</string>
+					<string key="superclassName">UITextField</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">backgroundNinePatch</string>
+						<string key="NS.object.0">TUNinePatch</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">backgroundNinePatch</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">backgroundNinePatch</string>
+							<string key="candidateClassName">TUNinePatch</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILinphoneTextField.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">WizardViewController</string>
 					<string key="superclassName">TPMultiLayoutViewController</string>
diff --git a/Resources/button_background_default.9.png b/Resources/button_background_default.9.png
new file mode 100644
index 000000000..ff37a4200
Binary files /dev/null and b/Resources/button_background_default.9.png differ
diff --git a/Resources/button_background_default.9@2x.png b/Resources/button_background_default.9@2x.png
new file mode 100644
index 000000000..c19f88e0b
Binary files /dev/null and b/Resources/button_background_default.9@2x.png differ
diff --git a/Resources/button_background_over.9.png b/Resources/button_background_over.9.png
new file mode 100644
index 000000000..943d82484
Binary files /dev/null and b/Resources/button_background_over.9.png differ
diff --git a/Resources/button_background_over.9@2x.png b/Resources/button_background_over.9@2x.png
new file mode 100644
index 000000000..c88681acf
Binary files /dev/null and b/Resources/button_background_over.9@2x.png differ
diff --git a/Resources/chat_address.png b/Resources/chat_address.png
deleted file mode 100644
index 5825587e7..000000000
Binary files a/Resources/chat_address.png and /dev/null differ
diff --git a/Resources/dialer_address_background_landscape~ipad.png b/Resources/dialer_address_background_landscape~ipad.png
index c5fc9c755..67fae34a3 100644
Binary files a/Resources/dialer_address_background_landscape~ipad.png and b/Resources/dialer_address_background_landscape~ipad.png differ
diff --git a/Resources/dialer_address_background~ipad.png b/Resources/dialer_address_background~ipad.png
index 489781e12..c5a7342e9 100644
Binary files a/Resources/dialer_address_background~ipad.png and b/Resources/dialer_address_background~ipad.png differ
diff --git a/Resources/field_background.9.png b/Resources/field_background.9.png
new file mode 100644
index 000000000..c8b34cdbf
Binary files /dev/null and b/Resources/field_background.9.png differ
diff --git a/Resources/field_background.9@2x.png b/Resources/field_background.9@2x.png
new file mode 100644
index 000000000..f24e08706
Binary files /dev/null and b/Resources/field_background.9@2x.png differ
diff --git a/linphone-Info.plist b/linphone-Info.plist
index f416a7976..ed59b192b 100644
--- a/linphone-Info.plist
+++ b/linphone-Info.plist
@@ -80,6 +80,8 @@
 	</array>
 	<key>UIRequiresPersistentWiFi</key>
 	<true/>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleBlackOpaque</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist
index 04620eba2..95b60cde3 100644
--- a/linphone.ldb/Contents.plist
+++ b/linphone.ldb/Contents.plist
@@ -337,17 +337,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>27</key>
+							<key>32</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>Classes/ChatRoomViewController/27/ChatRoomViewController.xib</string>
+								<string>Classes/ChatRoomViewController/32/ChatRoomViewController.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-20T15:39:51Z</date>
+					<date>2012-09-21T15:04:45Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -357,7 +357,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>627c45d39e108a9f3439b16112541cf7
+					<string>f3544e098ca4aed56e114bf9cb69da01
 </string>
 					<key>name</key>
 					<string>ChatRoomViewController.xib</string>
@@ -793,9 +793,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>27</string>
+						<string>32</string>
 						<key>fr</key>
-						<string>27</string>
+						<string>32</string>
 					</dict>
 				</dict>
 				<dict>
@@ -803,17 +803,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>11</key>
+							<key>14</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>Classes/ChatViewController/11/ChatViewController.xib</string>
+								<string>Classes/ChatViewController/14/ChatViewController.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-21T09:50:33Z</date>
+					<date>2012-09-21T14:10:39Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -823,7 +823,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>85daf0828bc846574f82f88cdfcf5873
+					<string>8c14eaa11baf171c54e5b5e4111cf584
 </string>
 					<key>name</key>
 					<string>ChatViewController.xib</string>
@@ -1038,9 +1038,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>11</string>
+						<string>14</string>
 						<key>fr</key>
-						<string>11</string>
+						<string>14</string>
 					</dict>
 				</dict>
 				<dict>
@@ -1368,17 +1368,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>3</key>
+							<key>4</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>Classes/DialerViewController/3/DialerViewController.xib</string>
+								<string>Classes/DialerViewController/4/DialerViewController.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-20T15:21:49Z</date>
+					<date>2012-09-21T12:30:11Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -1388,7 +1388,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>964fdf71f31dffd3f6cc28ead8aa2d3e
+					<string>8a2a96826784d150101b877d3d22c6a1
 </string>
 					<key>name</key>
 					<string>DialerViewController.xib</string>
@@ -1902,9 +1902,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>3</string>
+						<string>4</string>
 						<key>fr</key>
-						<string>3</string>
+						<string>4</string>
 					</dict>
 				</dict>
 				<dict>
@@ -1912,17 +1912,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>9</key>
+							<key>11</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>Classes/DialerViewController~ipad/9/DialerViewController~ipad.xib</string>
+								<string>Classes/DialerViewController~ipad/11/DialerViewController~ipad.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-20T15:21:48Z</date>
+					<date>2012-09-21T12:43:40Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -1932,7 +1932,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>9e024b6bdd4eea1304fefc8b28855794
+					<string>75e89e01d452e053bea070cc7ec8e9bc
 </string>
 					<key>name</key>
 					<string>DialerViewController~ipad.xib</string>
@@ -2471,9 +2471,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>9</string>
+						<string>11</string>
 						<key>fr</key>
-						<string>9</string>
+						<string>11</string>
 					</dict>
 				</dict>
 				<dict>
@@ -3689,17 +3689,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>13</key>
+							<key>14</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>Classes/WizardViewController/13/WizardViewController.xib</string>
+								<string>Classes/WizardViewController/14/WizardViewController.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-21T07:38:47Z</date>
+					<date>2012-09-21T13:03:03Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -3709,7 +3709,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>ffb9c46d3e8e64cc27d0fd3aa5063f41
+					<string>e1fc10096ab7b22c55089d5dccdf2015
 </string>
 					<key>name</key>
 					<string>WizardViewController.xib</string>
@@ -4999,9 +4999,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>13</string>
+						<string>14</string>
 						<key>fr</key>
-						<string>13</string>
+						<string>14</string>
 					</dict>
 				</dict>
 				<dict>
@@ -5103,17 +5103,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>12</key>
+							<key>15</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>Classes/WizardViews/12/WizardViews.xib</string>
+								<string>Classes/WizardViews/15/WizardViews.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-21T09:50:14Z</date>
+					<date>2012-09-21T14:23:27Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -5123,7 +5123,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>723b14414271e081b00e312017bf06fb
+					<string>28b7a6024bd7d81255243ef32288a7d6
 </string>
 					<key>name</key>
 					<string>WizardViews.xib</string>
@@ -6555,9 +6555,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>12</string>
+						<string>15</string>
 						<key>fr</key>
-						<string>12</string>
+						<string>15</string>
 					</dict>
 				</dict>
 				<dict>
@@ -6565,17 +6565,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>9</key>
+							<key>10</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>Classes/WizardViewController~ipad/9/WizardViewController~ipad.xib</string>
+								<string>Classes/WizardViewController~ipad/10/WizardViewController~ipad.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-21T07:48:15Z</date>
+					<date>2012-09-21T13:03:02Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -6585,7 +6585,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>a61bb43ff4eaf2a60eb5be26760190f5
+					<string>950141adce6aab34f1068654a47edf3c
 </string>
 					<key>name</key>
 					<string>WizardViewController~ipad.xib</string>
@@ -6899,9 +6899,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>9</string>
+						<string>10</string>
 						<key>fr</key>
-						<string>9</string>
+						<string>10</string>
 					</dict>
 				</dict>
 			</array>
@@ -9440,17 +9440,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>6</key>
+							<key>7</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>LinphoneUI/UIMainBar/6/UIMainBar.xib</string>
+								<string>LinphoneUI/UIMainBar/7/UIMainBar.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-20T15:02:25Z</date>
+					<date>2012-09-21T12:33:09Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -9460,7 +9460,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>188f1463d35316609315281b42709088
+					<string>3673d2d68bd62db4ac766f71230406cb
 </string>
 					<key>name</key>
 					<string>UIMainBar.xib</string>
@@ -9795,9 +9795,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>6</string>
+						<string>7</string>
 						<key>fr</key>
-						<string>6</string>
+						<string>7</string>
 					</dict>
 				</dict>
 				<dict>
@@ -9805,17 +9805,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>6</key>
+							<key>7</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>LinphoneUI/UIMainBar~ipad/6/UIMainBar~ipad.xib</string>
+								<string>LinphoneUI/UIMainBar~ipad/7/UIMainBar~ipad.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-20T15:02:34Z</date>
+					<date>2012-09-21T12:33:08Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -9825,7 +9825,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>0573baad5d18951a19a8f58c27eb183b
+					<string>7515bfc55761e951edeabce40676d625
 </string>
 					<key>name</key>
 					<string>UIMainBar~ipad.xib</string>
@@ -10441,9 +10441,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>6</string>
+						<string>7</string>
 						<key>fr</key>
-						<string>6</string>
+						<string>7</string>
 					</dict>
 				</dict>
 				<dict>
diff --git a/linphone.ldb/Resources/Classes/ChatRoomViewController/27/ChatRoomViewController.xib b/linphone.ldb/Resources/Classes/ChatRoomViewController/32/ChatRoomViewController.xib
similarity index 99%
rename from linphone.ldb/Resources/Classes/ChatRoomViewController/27/ChatRoomViewController.xib
rename to linphone.ldb/Resources/Classes/ChatRoomViewController/32/ChatRoomViewController.xib
index e60678397..7056bfce7 100644
--- a/linphone.ldb/Resources/Classes/ChatRoomViewController/27/ChatRoomViewController.xib
+++ b/linphone.ldb/Resources/Classes/ChatRoomViewController/32/ChatRoomViewController.xib
@@ -267,7 +267,6 @@
 										<string key="NSFrame">{{262, 0}, {58, 57}}</string>
 										<reference key="NSSuperview" ref="833509359"/>
 										<reference key="NSWindow"/>
-										<reference key="NSNextKeyView"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
 										<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -360,7 +359,7 @@
 									<object class="IBUIView" id="587350058">
 										<reference key="NSNextResponder" ref="833509359"/>
 										<int key="NSvFlags">274</int>
-										<string key="NSFrame">{{33, 10}, {232, 37}}</string>
+										<string key="NSFrame">{{39, 12}, {218, 33}}</string>
 										<reference key="NSSuperview" ref="833509359"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="487645621"/>
diff --git a/linphone.ldb/Resources/Classes/ChatViewController/11/ChatViewController.xib b/linphone.ldb/Resources/Classes/ChatViewController/14/ChatViewController.xib
similarity index 94%
rename from linphone.ldb/Resources/Classes/ChatViewController/11/ChatViewController.xib
rename to linphone.ldb/Resources/Classes/ChatViewController/14/ChatViewController.xib
index eabdb3cfa..638433c1b 100644
--- a/linphone.ldb/Resources/Classes/ChatViewController/11/ChatViewController.xib
+++ b/linphone.ldb/Resources/Classes/ChatViewController/14/ChatViewController.xib
@@ -203,8 +203,8 @@
 					</object>
 					<object class="IBUITextField" id="585481821">
 						<reference key="NSNextResponder" ref="1010501960"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{25, 44}, {271, 35}}</string>
+						<int key="NSvFlags">290</int>
+						<string key="NSFrame">{{2, 44}, {316, 35}}</string>
 						<reference key="NSSuperview" ref="1010501960"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="69932958"/>
@@ -234,7 +234,7 @@
 						</object>
 						<object class="NSCustomResource" key="IBUIBackground">
 							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">chat_address.png</string>
+							<string key="NSResourceName">field_background.png</string>
 						</object>
 						<int key="IBUIClearButtonMode">1</int>
 						<object class="IBUIFontDescription" key="IBUIFontDescription">
@@ -439,6 +439,7 @@
 				<real value="1" key="10.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
 				<real value="1" key="10.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="25.CustomClassName">UILinphoneTextField</string>
 				<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="4.CustomClassName">ChatTableViewController</string>
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -507,6 +508,33 @@
 						<string key="minorKey">./Classes/ChatViewController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">TUNinePatch</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TUNinePatch.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILinphoneTextField</string>
+					<string key="superclassName">UITextField</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">backgroundNinePatch</string>
+						<string key="NS.object.0">TUNinePatch</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">backgroundNinePatch</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">backgroundNinePatch</string>
+							<string key="candidateClassName">TUNinePatch</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILinphoneTextField.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">UIToggleButton</string>
 					<string key="superclassName">UIButton</string>
@@ -528,10 +556,10 @@
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<string key="chat_add_default.png">{320, 88}</string>
 			<string key="chat_add_over.png">{320, 88}</string>
-			<string key="chat_address.png">{542, 70}</string>
 			<string key="chat_edit_default.png">{320, 88}</string>
 			<string key="chat_edit_over.png">{320, 88}</string>
 			<string key="chat_ok_default.png">{320, 88}</string>
+			<string key="field_background.png">{542, 88}</string>
 			<string key="toolsbar_background.png">{5, 88}</string>
 		</dictionary>
 		<string key="IBCocoaTouchPluginVersion">1926</string>
diff --git a/linphone.ldb/Resources/Classes/DialerViewController/3/DialerViewController.xib b/linphone.ldb/Resources/Classes/DialerViewController/4/DialerViewController.xib
similarity index 81%
rename from linphone.ldb/Resources/Classes/DialerViewController/3/DialerViewController.xib
rename to linphone.ldb/Resources/Classes/DialerViewController/4/DialerViewController.xib
index ac00637cf..24f5ce0c0 100644
--- a/linphone.ldb/Resources/Classes/DialerViewController/3/DialerViewController.xib
+++ b/linphone.ldb/Resources/Classes/DialerViewController/4/DialerViewController.xib
@@ -51,8 +51,13 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{320, 80}</string>
 								<reference key="NSSuperview" ref="312750714"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="751637181"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<object class="NSColor" key="IBUIBackgroundColor" id="377660437">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwAA</bytes>
+								</object>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								<object class="NSCustomResource" key="IBUIImage">
@@ -65,11 +70,9 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{320, 60}</string>
 								<reference key="NSSuperview" ref="312750714"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="242430033"/>
-								<object class="NSColor" key="IBUIBackgroundColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MSAwAA</bytes>
-								</object>
+								<reference key="IBUIBackgroundColor" ref="377660437"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -104,15 +107,10 @@
 						</object>
 						<string key="NSFrameSize">{320, 80}</string>
 						<reference key="NSSuperview" ref="542426306"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="874403835"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MSAwAA</bytes>
-							<object class="NSColorSpace" key="NSCustomColorSpace" id="415406112">
-								<int key="NSID">2</int>
-							</object>
-						</object>
+						<reference key="IBUIBackgroundColor" ref="377660437"/>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
@@ -126,6 +124,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 11}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="607229252"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@@ -168,6 +167,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 11}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1070392235"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -194,6 +194,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 11}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="539158319"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -220,6 +221,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 73}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="539781036"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -246,6 +248,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 73}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="573280603"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -272,6 +275,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 73}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="150499342"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -298,6 +302,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 135}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="616388880"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -324,6 +329,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 135}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="624378925"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -350,6 +356,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 135}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="465571136"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -376,6 +383,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 197}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="602859574"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -402,6 +410,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 197}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="310945439"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -428,6 +437,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 197}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="242430033"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="32193173"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -452,12 +462,10 @@
 						</object>
 						<string key="NSFrame">{{0, 58}, {320, 260}}</string>
 						<reference key="NSSuperview" ref="542426306"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="201618948"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor" id="377660437">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MCAwAA</bytes>
-						</object>
+						<reference key="IBUIBackgroundColor" ref="377660437"/>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
 					<object class="IBUIView" id="32193173">
@@ -470,6 +478,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{106, 69}</string>
 								<reference key="NSSuperview" ref="32193173"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="617539638"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -506,6 +515,7 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrameSize">{106, 69}</string>
 								<reference key="NSSuperview" ref="32193173"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="749717331"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -538,6 +548,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{106, 0}, {108, 69}}</string>
 								<reference key="NSSuperview" ref="32193173"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="375677999"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -571,6 +582,7 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{106, 0}, {108, 69}}</string>
 								<reference key="NSSuperview" ref="32193173"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="275435271"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -604,6 +616,7 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{106, 0}, {108, 69}}</string>
 								<reference key="NSSuperview" ref="32193173"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="992434254"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -637,6 +650,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{214, 0}, {106, 69}}</string>
 								<reference key="NSSuperview" ref="32193173"/>
+								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -667,18 +681,22 @@
 						</object>
 						<string key="NSFrame">{{0, 305}, {320, 69}}</string>
 						<reference key="NSSuperview" ref="542426306"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="657970815"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MSAwAA</bytes>
-							<reference key="NSCustomColorSpace" ref="415406112"/>
+							<object class="NSColorSpace" key="NSCustomColorSpace">
+								<int key="NSID">2</int>
+							</object>
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
 				</object>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="312750714"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="377660437"/>
@@ -1363,7 +1381,341 @@
 			<nil key="sourceID"/>
 			<int key="maxID">254</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">DialerViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>onAddContactClick:</string>
+							<string>onAddressChange:</string>
+							<string>onBackClick:</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>onAddContactClick:</string>
+							<string>onAddressChange:</string>
+							<string>onBackClick:</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">onAddContactClick:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">onAddressChange:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">onBackClick:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>addCallButton</string>
+							<string>addContactButton</string>
+							<string>addressField</string>
+							<string>backButton</string>
+							<string>backgroundView</string>
+							<string>callButton</string>
+							<string>eightButton</string>
+							<string>eraseButton</string>
+							<string>fiveButton</string>
+							<string>fourButton</string>
+							<string>nineButton</string>
+							<string>oneButton</string>
+							<string>sevenButton</string>
+							<string>sharpButton</string>
+							<string>sixButton</string>
+							<string>starButton</string>
+							<string>threeButton</string>
+							<string>transferButton</string>
+							<string>twoButton</string>
+							<string>videoCameraSwitch</string>
+							<string>videoPreview</string>
+							<string>zeroButton</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>UICallButton</string>
+							<string>UIButton</string>
+							<string>UITextField</string>
+							<string>UIButton</string>
+							<string>UIView</string>
+							<string>UICallButton</string>
+							<string>UIDigitButton</string>
+							<string>UIEraseButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UIDigitButton</string>
+							<string>UITransferButton</string>
+							<string>UIDigitButton</string>
+							<string>UICamSwitch</string>
+							<string>UIView</string>
+							<string>UIDigitButton</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>addCallButton</string>
+							<string>addContactButton</string>
+							<string>addressField</string>
+							<string>backButton</string>
+							<string>backgroundView</string>
+							<string>callButton</string>
+							<string>eightButton</string>
+							<string>eraseButton</string>
+							<string>fiveButton</string>
+							<string>fourButton</string>
+							<string>nineButton</string>
+							<string>oneButton</string>
+							<string>sevenButton</string>
+							<string>sharpButton</string>
+							<string>sixButton</string>
+							<string>starButton</string>
+							<string>threeButton</string>
+							<string>transferButton</string>
+							<string>twoButton</string>
+							<string>videoCameraSwitch</string>
+							<string>videoPreview</string>
+							<string>zeroButton</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">addCallButton</string>
+								<string key="candidateClassName">UICallButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">addContactButton</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">addressField</string>
+								<string key="candidateClassName">UITextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">backButton</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">backgroundView</string>
+								<string key="candidateClassName">UIView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">callButton</string>
+								<string key="candidateClassName">UICallButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">eightButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">eraseButton</string>
+								<string key="candidateClassName">UIEraseButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fiveButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fourButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">nineButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">oneButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">sevenButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">sharpButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">sixButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">starButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">threeButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">transferButton</string>
+								<string key="candidateClassName">UITransferButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">twoButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">videoCameraSwitch</string>
+								<string key="candidateClassName">UICamSwitch</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">videoPreview</string>
+								<string key="candidateClassName">UIView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">zeroButton</string>
+								<string key="candidateClassName">UIDigitButton</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/DialerViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIAddressTextField</string>
+					<string key="superclassName">UITextField</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIAddressTextField.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UICallButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">addressField</string>
+						<string key="NS.object.0">UITextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addressField</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UICallButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UICamSwitch</string>
+					<string key="superclassName">UIButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">preview</string>
+						<string key="NS.object.0">UIView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">preview</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">preview</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UICamSwitch.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIDigitButton</string>
+					<string key="superclassName">UILongTouchButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">addressField</string>
+						<string key="NS.object.0">UITextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addressField</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+					</object>
+					<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">UIEraseButton</string>
+					<string key="superclassName">UILongTouchButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">addressField</string>
+						<string key="NS.object.0">UITextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addressField</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIEraseButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILongTouchButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILongTouchButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UITransferButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">addressField</string>
+						<string key="NS.object.0">UITextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addressField</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UITransferButton.h</string>
+					</object>
+				</object>
+			</object>
+		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
diff --git a/linphone.ldb/Resources/Classes/DialerViewController~ipad/9/DialerViewController~ipad.xib b/linphone.ldb/Resources/Classes/DialerViewController~ipad/11/DialerViewController~ipad.xib
similarity index 97%
rename from linphone.ldb/Resources/Classes/DialerViewController~ipad/9/DialerViewController~ipad.xib
rename to linphone.ldb/Resources/Classes/DialerViewController~ipad/11/DialerViewController~ipad.xib
index ae1c56e6a..9f5148f36 100644
--- a/linphone.ldb/Resources/Classes/DialerViewController~ipad/9/DialerViewController~ipad.xib
+++ b/linphone.ldb/Resources/Classes/DialerViewController~ipad/11/DialerViewController~ipad.xib
@@ -40,8 +40,9 @@
 					<object class="IBUIImageView" id="422247190">
 						<reference key="NSNextResponder" ref="450916897"/>
 						<int key="NSvFlags">301</int>
-						<string key="NSFrame">{{127, 150}, {510, 460}}</string>
+						<string key="NSFrame">{{127, 200}, {510, 460}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="811328787"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<int key="IBUIContentMode">1</int>
@@ -57,6 +58,7 @@
 						<int key="NSvFlags">301</int>
 						<string key="NSFrame">{{-1000, -1000}, {2768, 2900}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="935083036"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -70,6 +72,7 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{0, 58}, {768, 842}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="857979271"/>
 						<object class="NSColor" key="IBUIBackgroundColor" id="474273757">
 							<int key="NSColorSpace">3</int>
@@ -83,6 +86,7 @@
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{20, 90}, {85, 33}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="422247190"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -120,13 +124,30 @@
 						<reference key="NSNextResponder" ref="450916897"/>
 						<int key="NSvFlags">290</int>
 						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIView" id="885330675">
+								<reference key="NSNextResponder" ref="935083036"/>
+								<int key="NSvFlags">290</int>
+								<string key="NSFrame">{{0, -2000}, {768, 2000}}</string>
+								<reference key="NSSuperview" ref="935083036"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="33995646"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<object class="NSColor" key="IBUIBackgroundColor">
+									<int key="NSColorSpace">1</int>
+									<bytes key="NSRGB">MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA</bytes>
+								</object>
+								<int key="IBUITag">28</int>
+								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+							</object>
 							<object class="IBUIImageView" id="33995646">
 								<reference key="NSNextResponder" ref="935083036"/>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{768, 80}</string>
 								<reference key="NSSuperview" ref="935083036"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="770143841"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<reference key="IBUIBackgroundColor" ref="474273757"/>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 								<object class="NSCustomResource" key="IBUIImage">
@@ -139,11 +160,9 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{700, 60}</string>
 								<reference key="NSSuperview" ref="935083036"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1069606219"/>
-								<object class="NSColor" key="IBUIBackgroundColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MSAwAA</bytes>
-								</object>
+								<reference key="IBUIBackgroundColor" ref="474273757"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -180,6 +199,7 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{698, 4}, {70, 51}}</string>
 								<reference key="NSSuperview" ref="935083036"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="820868226"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -215,16 +235,10 @@
 						</array>
 						<string key="NSFrameSize">{768, 80}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSNextKeyView" ref="33995646"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="885330675"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MSAwAA</bytes>
-							<object class="NSColorSpace" key="NSCustomColorSpace" id="691271921">
-								<int key="NSID">2</int>
-							</object>
-						</object>
-						<bool key="IBUIClipsSubviews">YES</bool>
+						<reference key="IBUIBackgroundColor" ref="474273757"/>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 					</object>
 					<object class="IBUIView" id="811328787">
@@ -236,6 +250,7 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{320, 280}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="257730270"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">2</int>
@@ -251,6 +266,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 11}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="579980565"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@@ -286,6 +302,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 11}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="534491605"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -312,6 +329,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 11}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="405606838"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -338,6 +356,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 73}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="984444210"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -364,6 +383,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 73}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="505513327"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -390,6 +410,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 73}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="829692929"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -416,6 +437,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 135}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="430965229"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -442,6 +464,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 135}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="565116665"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -468,6 +491,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 135}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="47810246"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -494,6 +518,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 197}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="776264615"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -520,6 +545,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{107, 197}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="718499319"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -546,6 +572,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{213, 197}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="683359487"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -570,6 +597,7 @@
 						</array>
 						<string key="NSFrame">{{0, 640}, {320, 260}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="848268216"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="474273757"/>
@@ -584,6 +612,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{126, 85}</string>
 								<reference key="NSSuperview" ref="683359487"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="405746031"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -617,6 +646,7 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrameSize">{126, 85}</string>
 								<reference key="NSSuperview" ref="683359487"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="981547916"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -649,6 +679,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{126, 0}, {186, 85}}</string>
 								<reference key="NSSuperview" ref="683359487"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="514058756"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -682,6 +713,7 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{126, 0}, {186, 85}}</string>
 								<reference key="NSSuperview" ref="683359487"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1043651254"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -715,6 +747,8 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{126, 0}, {186, 85}}</string>
 								<reference key="NSSuperview" ref="683359487"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -745,18 +779,22 @@
 						</array>
 						<string key="NSFrame">{{456, 815}, {312, 85}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="169100052"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MSAwAA</bytes>
-							<reference key="NSCustomColorSpace" ref="691271921"/>
+							<object class="NSColorSpace" key="NSCustomColorSpace">
+								<int key="NSID">2</int>
+							</object>
 						</object>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 					</object>
 				</array>
 				<string key="NSFrameSize">{768, 900}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="887694290"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="474273757"/>
@@ -1187,6 +1225,7 @@
 							<reference ref="770143841"/>
 							<reference ref="33995646"/>
 							<reference ref="1069606219"/>
+							<reference ref="885330675"/>
 						</array>
 						<reference key="parent" ref="450916897"/>
 						<string key="objectName">dialer</string>
@@ -1342,6 +1381,12 @@
 						<reference key="parent" ref="450916897"/>
 						<string key="objectName">preview</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">79</int>
+						<reference key="object" ref="885330675"/>
+						<reference key="parent" ref="935083036"/>
+						<string key="objectName">background</string>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1410,6 +1455,7 @@
 				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="76.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="78.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.CustomClassName">UIDigitButton</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="8.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
@@ -1421,7 +1467,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">78</int>
+			<int key="maxID">79</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/linphone.ldb/Resources/Classes/WizardViewController/13/WizardViewController.xib b/linphone.ldb/Resources/Classes/WizardViewController/14/WizardViewController.xib
similarity index 99%
rename from linphone.ldb/Resources/Classes/WizardViewController/13/WizardViewController.xib
rename to linphone.ldb/Resources/Classes/WizardViewController/14/WizardViewController.xib
index f01b4bf29..19ddd7f5d 100644
--- a/linphone.ldb/Resources/Classes/WizardViewController/13/WizardViewController.xib
+++ b/linphone.ldb/Resources/Classes/WizardViewController/14/WizardViewController.xib
@@ -152,7 +152,6 @@
 								<int key="NSvFlags">-2147483357</int>
 								<string key="NSFrame">{{160, 0}, {160, 77}}</string>
 								<reference key="NSSuperview" ref="1057285194"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<int key="IBUITag">5</int>
diff --git a/linphone.ldb/Resources/Classes/WizardViewController~ipad/9/WizardViewController~ipad.xib b/linphone.ldb/Resources/Classes/WizardViewController~ipad/10/WizardViewController~ipad.xib
similarity index 84%
rename from linphone.ldb/Resources/Classes/WizardViewController~ipad/9/WizardViewController~ipad.xib
rename to linphone.ldb/Resources/Classes/WizardViewController~ipad/10/WizardViewController~ipad.xib
index d3414692d..0b2e69b39 100644
--- a/linphone.ldb/Resources/Classes/WizardViewController~ipad/9/WizardViewController~ipad.xib
+++ b/linphone.ldb/Resources/Classes/WizardViewController~ipad/10/WizardViewController~ipad.xib
@@ -42,7 +42,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrameSize">{768, 966}</string>
 						<reference key="NSSuperview" ref="770392660"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="62439358"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -61,7 +60,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 77}, {768, 2000}}</string>
 								<reference key="NSSuperview" ref="1057285194"/>
-								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@@ -75,7 +73,6 @@
 								<int key="NSvFlags">294</int>
 								<string key="NSFrameSize">{384, 77}</string>
 								<reference key="NSSuperview" ref="1057285194"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="237722854"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -132,7 +129,6 @@
 								<int key="NSvFlags">291</int>
 								<string key="NSFrame">{{384, 0}, {384, 77}}</string>
 								<reference key="NSSuperview" ref="1057285194"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="483101671"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -169,7 +165,6 @@
 								<int key="NSvFlags">-2147483357</int>
 								<string key="NSFrame">{{384, 0}, {384, 77}}</string>
 								<reference key="NSSuperview" ref="1057285194"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="938095663"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -208,7 +203,6 @@
 						</array>
 						<string key="NSFrame">{{0, 947}, {768, 77}}</string>
 						<reference key="NSSuperview" ref="770392660"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="954353386"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor" id="981989056">
@@ -227,7 +221,6 @@
 								<int key="NSvFlags">301</int>
 								<string key="NSFrame">{{366, 492}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="62439358"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1057285194"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -240,7 +233,6 @@
 						</array>
 						<string key="NSFrameSize">{768, 1024}</string>
 						<reference key="NSSuperview" ref="770392660"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="41091084"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -253,7 +245,6 @@
 				</array>
 				<string key="NSFrameSize">{768, 1024}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="1004767347"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="981989056"/>
@@ -268,7 +259,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrameSize">{1024, 711}</string>
 						<reference key="NSSuperview" ref="298371011"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1066982838"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -287,7 +277,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 77}, {1024, 2000}}</string>
 								<reference key="NSSuperview" ref="880278922"/>
-								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@@ -301,7 +290,6 @@
 								<int key="NSvFlags">294</int>
 								<string key="NSFrameSize">{512, 77}</string>
 								<reference key="NSSuperview" ref="880278922"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1028981026"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -348,7 +336,6 @@
 								<int key="NSvFlags">291</int>
 								<string key="NSFrame">{{512, 0}, {512, 77}}</string>
 								<reference key="NSSuperview" ref="880278922"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="351442668"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -385,7 +372,6 @@
 								<int key="NSvFlags">-2147483357</int>
 								<string key="NSFrame">{{512, 0}, {512, 77}}</string>
 								<reference key="NSSuperview" ref="880278922"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="91020530"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -424,7 +410,6 @@
 						</array>
 						<string key="NSFrame">{{0, 691}, {1024, 77}}</string>
 						<reference key="NSSuperview" ref="298371011"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="378153891"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="981989056"/>
@@ -440,7 +425,6 @@
 								<int key="NSvFlags">301</int>
 								<string key="NSFrame">{{494, 364}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="1066982838"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="880278922"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -453,7 +437,6 @@
 						</array>
 						<string key="NSFrameSize">{1024, 768}</string>
 						<reference key="NSSuperview" ref="298371011"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="102198390"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -466,7 +449,6 @@
 				</array>
 				<string key="NSFrameSize">{1024, 768}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="630762107"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="981989056"/>
@@ -785,148 +767,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">137</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">TPMultiLayoutViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="landscapeView">UIView</string>
-						<string key="portraitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="landscapeView">
-							<string key="name">landscapeView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="portraitView">
-							<string key="name">portraitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">WizardViewController</string>
-					<string key="superclassName">TPMultiLayoutViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onBackClick:">id</string>
-						<string key="onCancelClick:">id</string>
-						<string key="onCheckValidationClick:">id</string>
-						<string key="onConnectAccountClick:">id</string>
-						<string key="onCreateAccountClick:">id</string>
-						<string key="onExternalAccountClick:">id</string>
-						<string key="onRegisterClick:">id</string>
-						<string key="onSignInClick:">id</string>
-						<string key="onSignInExternalClick:">id</string>
-						<string key="onStartClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onBackClick:">
-							<string key="name">onBackClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onCancelClick:">
-							<string key="name">onCancelClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onCheckValidationClick:">
-							<string key="name">onCheckValidationClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onConnectAccountClick:">
-							<string key="name">onConnectAccountClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onCreateAccountClick:">
-							<string key="name">onCreateAccountClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onExternalAccountClick:">
-							<string key="name">onExternalAccountClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onRegisterClick:">
-							<string key="name">onRegisterClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onSignInClick:">
-							<string key="name">onSignInClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onSignInExternalClick:">
-							<string key="name">onSignInExternalClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onStartClick:">
-							<string key="name">onStartClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="backButton">UIButton</string>
-						<string key="choiceView">UIView</string>
-						<string key="connectAccountView">UIView</string>
-						<string key="contentView">UIScrollView</string>
-						<string key="createAccountView">UIView</string>
-						<string key="externalAccountView">UIView</string>
-						<string key="startButton">UIButton</string>
-						<string key="validateAccountView">UIView</string>
-						<string key="waitView">UIView</string>
-						<string key="welcomeView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="backButton">
-							<string key="name">backButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="choiceView">
-							<string key="name">choiceView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="connectAccountView">
-							<string key="name">connectAccountView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="contentView">
-							<string key="name">contentView</string>
-							<string key="candidateClassName">UIScrollView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="createAccountView">
-							<string key="name">createAccountView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="externalAccountView">
-							<string key="name">externalAccountView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="startButton">
-							<string key="name">startButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="validateAccountView">
-							<string key="name">validateAccountView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="waitView">
-							<string key="name">waitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="welcomeView">
-							<string key="name">welcomeView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/WizardViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
diff --git a/linphone.ldb/Resources/Classes/WizardViews/12/WizardViews.xib b/linphone.ldb/Resources/Classes/WizardViews/15/WizardViews.xib
similarity index 95%
rename from linphone.ldb/Resources/Classes/WizardViews/12/WizardViews.xib
rename to linphone.ldb/Resources/Classes/WizardViews/15/WizardViews.xib
index 00a8b25a5..3c21a990c 100644
--- a/linphone.ldb/Resources/Classes/WizardViews/12/WizardViews.xib
+++ b/linphone.ldb/Resources/Classes/WizardViews/15/WizardViews.xib
@@ -44,7 +44,7 @@
 						<string key="NSFrame">{{60, 80}, {201, 129}}</string>
 						<reference key="NSSuperview" ref="741268807"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="265601557"/>
+						<reference key="NSNextKeyView" ref="225959176"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<int key="IBUIContentMode">1</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -60,11 +60,11 @@
 					</object>
 					<object class="IBUILabel" id="225959176">
 						<reference key="NSNextResponder" ref="741268807"/>
-						<int key="NSvFlags">311</int>
+						<int key="NSvFlags">319</int>
 						<string key="NSFrame">{{31, 230}, {258, 40}}</string>
 						<reference key="NSSuperview" ref="741268807"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="462684684"/>
+						<reference key="NSNextKeyView" ref="265601557"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -134,7 +134,7 @@
 				<string key="NSFrameSize">{320, 394}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="225959176"/>
+				<reference key="NSNextKeyView" ref="462684684"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor" id="981989056">
 					<int key="NSColorSpace">3</int>
@@ -314,7 +314,7 @@
 					</object>
 					<object class="IBUILabel" id="696113137">
 						<reference key="NSNextResponder" ref="183617546"/>
-						<int key="NSvFlags">298</int>
+						<int key="NSvFlags">314</int>
 						<string key="NSFrame">{{39, 80}, {240, 44}}</string>
 						<reference key="NSSuperview" ref="183617546"/>
 						<reference key="NSWindow"/>
@@ -553,7 +553,7 @@
 					</object>
 					<object class="IBUILabel" id="391450353">
 						<reference key="NSNextResponder" ref="101753691"/>
-						<int key="NSvFlags">298</int>
+						<int key="NSvFlags">314</int>
 						<string key="NSFrame">{{40, 80}, {240, 44}}</string>
 						<reference key="NSSuperview" ref="101753691"/>
 						<reference key="NSWindow"/>
@@ -708,7 +708,7 @@
 					</object>
 					<object class="IBUILabel" id="923226743">
 						<reference key="NSNextResponder" ref="71390966"/>
-						<int key="NSvFlags">298</int>
+						<int key="NSvFlags">314</int>
 						<string key="NSFrame">{{40, 80}, {240, 44}}</string>
 						<reference key="NSSuperview" ref="71390966"/>
 						<reference key="NSWindow"/>
@@ -895,7 +895,7 @@
 					</object>
 					<object class="IBUILabel" id="100756849">
 						<reference key="NSNextResponder" ref="611643284"/>
-						<int key="NSvFlags">298</int>
+						<int key="NSvFlags">314</int>
 						<string key="NSFrame">{{40, 80}, {240, 44}}</string>
 						<reference key="NSSuperview" ref="611643284"/>
 						<reference key="NSWindow"/>
@@ -1505,10 +1505,13 @@
 				<string key="-2.CustomClassName">UIResponder</string>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="101.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="103.CustomClassName">UILinphoneButton</string>
 				<string key="103.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="103.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="104.CustomClassName">UILinphoneTextField</string>
 				<string key="104.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="105.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="106.CustomClassName">UILinphoneTextField</string>
 				<string key="106.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="117.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="122.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -1520,32 +1523,46 @@
 				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="33.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="36.CustomClassName">UILinphoneButton</string>
 				<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="1" key="36.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="38.CustomClassName">UILinphoneButton</string>
 				<string key="38.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="1" key="38.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="39.CustomClassName">UILinphoneButton</string>
 				<string key="39.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="1" key="39.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="44.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="52.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="59.CustomClassName">UILinphoneTextField</string>
 				<string key="59.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="60.CustomClassName">UILinphoneTextField</string>
 				<string key="60.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="61.CustomClassName">UILinphoneTextField</string>
 				<string key="61.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="62.CustomClassName">UILinphoneButton</string>
 				<string key="62.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="62.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="64.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="64.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="66.CustomClassName">UILinphoneTextField</string>
 				<string key="66.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="67.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="68.CustomClassName">UILinphoneTextField</string>
 				<string key="68.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="74.CustomClassName">UILinphoneTextField</string>
 				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="75.CustomClassName">UILinphoneTextField</string>
 				<string key="75.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="76.CustomClassName">UILinphoneTextField</string>
 				<string key="76.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="77.CustomClassName">UILinphoneButton</string>
 				<string key="77.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="77.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="79.CustomClassName">UILinphoneTextField</string>
 				<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
@@ -1578,6 +1595,55 @@
 						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">TUNinePatch</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TUNinePatch.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILinphoneButton</string>
+					<string key="superclassName">UIButton</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="backgroundNinePatch">TUNinePatch</string>
+						<string key="backgroundOverNinePatch">TUNinePatch</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="backgroundNinePatch">
+							<string key="name">backgroundNinePatch</string>
+							<string key="candidateClassName">TUNinePatch</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="backgroundOverNinePatch">
+							<string key="name">backgroundOverNinePatch</string>
+							<string key="candidateClassName">TUNinePatch</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILinphoneButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILinphoneTextField</string>
+					<string key="superclassName">UITextField</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">backgroundNinePatch</string>
+						<string key="NS.object.0">TUNinePatch</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">backgroundNinePatch</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">backgroundNinePatch</string>
+							<string key="candidateClassName">TUNinePatch</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILinphoneTextField.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">WizardViewController</string>
 					<string key="superclassName">TPMultiLayoutViewController</string>
diff --git a/linphone.ldb/Resources/LinphoneUI/UIMainBar/6/UIMainBar.xib b/linphone.ldb/Resources/LinphoneUI/UIMainBar/7/UIMainBar.xib
similarity index 98%
rename from linphone.ldb/Resources/LinphoneUI/UIMainBar/6/UIMainBar.xib
rename to linphone.ldb/Resources/LinphoneUI/UIMainBar/7/UIMainBar.xib
index cb27c7c36..9b06cec18 100644
--- a/linphone.ldb/Resources/LinphoneUI/UIMainBar/6/UIMainBar.xib
+++ b/linphone.ldb/Resources/LinphoneUI/UIMainBar/7/UIMainBar.xib
@@ -42,7 +42,6 @@
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{0, 11}, {320, 66}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="698962606"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -61,7 +60,6 @@
 						<int key="NSvFlags">290</int>
 						<string key="NSFrame">{{0, 77}, {320, 2000}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
@@ -75,7 +73,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrameSize">{64, 77}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="83510153"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -138,7 +135,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{21, 21}</string>
 								<reference key="NSSuperview" ref="698962606"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="364959328"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -153,7 +149,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{2, 2}, {17, 17}}</string>
 								<reference key="NSSuperview" ref="698962606"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="617445003"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -180,7 +175,6 @@
 						</array>
 						<string key="NSFrame">{{38, 1}, {21, 21}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="307047814"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor" id="41402419">
@@ -196,7 +190,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{64, 0}, {64, 77}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="562688945"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -236,7 +229,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{256, 0}, {64, 77}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="55915342"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -276,7 +268,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{128, 0}, {64, 77}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="60891552"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -315,7 +306,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{192, 0}, {64, 77}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="154031566"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -359,7 +349,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{21, 21}</string>
 								<reference key="NSSuperview" ref="154031566"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="540244639"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -371,7 +360,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{2, 2}, {17, 17}}</string>
 								<reference key="NSSuperview" ref="154031566"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="760939856"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -395,7 +383,6 @@
 						</array>
 						<string key="NSFrame">{{197, 1}, {21, 21}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="651674302"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="41402419"/>
@@ -406,7 +393,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 77}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="318948703"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
diff --git a/linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/6/UIMainBar~ipad.xib b/linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/7/UIMainBar~ipad.xib
similarity index 90%
rename from linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/6/UIMainBar~ipad.xib
rename to linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/7/UIMainBar~ipad.xib
index e8646ae44..d72f12f02 100644
--- a/linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/6/UIMainBar~ipad.xib
+++ b/linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/7/UIMainBar~ipad.xib
@@ -42,7 +42,6 @@
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{0, 11}, {768, 66}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="16083720"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -61,7 +60,6 @@
 						<int key="NSvFlags">290</int>
 						<string key="NSFrame">{{0, 77}, {768, 2000}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="877138605"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -76,7 +74,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrameSize">{175, 77}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="783828575"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -140,7 +137,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{21, 21}</string>
 								<reference key="NSSuperview" ref="16083720"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="690072035"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -155,7 +151,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{2, 2}, {17, 17}}</string>
 								<reference key="NSSuperview" ref="16083720"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1012118169"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -182,7 +177,6 @@
 						</array>
 						<string key="NSFrame">{{144, 1}, {21, 21}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="459410862"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor" id="339339950">
@@ -199,7 +193,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{175, 0}, {175, 77}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="103487099"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -240,7 +233,6 @@
 						<int key="NSvFlags">288</int>
 						<string key="NSFrame">{{350, -1}, {68, 80}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="66637371"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -280,7 +272,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{593, 0}, {175, 77}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="686020189"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -321,7 +312,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{418, 0}, {175, 77}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="582329659"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -366,7 +356,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{21, 21}</string>
 								<reference key="NSSuperview" ref="686020189"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="541323646"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -378,7 +367,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{2, 2}, {17, 17}}</string>
 								<reference key="NSSuperview" ref="686020189"/>
-								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
@@ -401,7 +389,6 @@
 						</array>
 						<string key="NSFrame">{{428, 1}, {21, 21}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="765093070"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="339339950"/>
@@ -413,7 +400,6 @@
 				</array>
 				<string key="NSFrameSize">{768, 77}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="172706520"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -432,7 +418,6 @@
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{0, 19}, {1024, 67}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="948217795"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -451,7 +436,6 @@
 						<int key="NSvFlags">290</int>
 						<string key="NSFrame">{{0, 86}, {1024, 2000}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="174827909"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -466,7 +450,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrameSize">{240, 86}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="91594118"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -511,7 +494,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{21, 21}</string>
 								<reference key="NSSuperview" ref="948217795"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="281444351"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -523,7 +505,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{2, 2}, {17, 17}}</string>
 								<reference key="NSSuperview" ref="948217795"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="872188125"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -543,7 +524,6 @@
 						</array>
 						<string key="NSFrame">{{209, 1}, {21, 21}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="70667666"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="339339950"/>
@@ -557,7 +537,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{240, 0}, {240, 86}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="849328902"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -598,7 +577,6 @@
 						<int key="NSvFlags">288</int>
 						<string key="NSFrame">{{480, 8}, {68, 80}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="730250721"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -622,7 +600,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{784, 0}, {240, 86}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<int key="IBUITag">5</int>
@@ -662,7 +639,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{548, 0}, {240, 86}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="129284976"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -707,7 +683,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{21, 21}</string>
 								<reference key="NSSuperview" ref="129284976"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="183279807"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -719,7 +694,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{2, 2}, {17, 17}}</string>
 								<reference key="NSSuperview" ref="129284976"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="13787191"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -739,7 +713,6 @@
 						</array>
 						<string key="NSFrame">{{558, 1}, {21, 21}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="669403928"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="339339950"/>
@@ -751,7 +724,6 @@
 				</array>
 				<string key="NSFrameSize">{1024, 86}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="938095300"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -1195,118 +1167,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">62</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">TPMultiLayoutViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="landscapeView">UIView</string>
-						<string key="portraitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="landscapeView">
-							<string key="name">landscapeView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="portraitView">
-							<string key="name">portraitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIMainBar</string>
-					<string key="superclassName">TPMultiLayoutViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onChatClick:">id</string>
-						<string key="onContactsClick:">id</string>
-						<string key="onDialerClick:">id</string>
-						<string key="onHistoryClick:">id</string>
-						<string key="onSettingsClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onChatClick:">
-							<string key="name">onChatClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onContactsClick:">
-							<string key="name">onContactsClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onDialerClick:">
-							<string key="name">onDialerClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onHistoryClick:">
-							<string key="name">onHistoryClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onSettingsClick:">
-							<string key="name">onSettingsClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="chatButton">UIButton</string>
-						<string key="chatNotificationLabel">UILabel</string>
-						<string key="chatNotificationView">UIView</string>
-						<string key="contactsButton">UIButton</string>
-						<string key="dialerButton">UIButton</string>
-						<string key="historyButton">UIButton</string>
-						<string key="historyNotificationLabel">UILabel</string>
-						<string key="historyNotificationView">UIView</string>
-						<string key="settingsButton">UIButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="chatButton">
-							<string key="name">chatButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="chatNotificationLabel">
-							<string key="name">chatNotificationLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="chatNotificationView">
-							<string key="name">chatNotificationView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="contactsButton">
-							<string key="name">contactsButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="dialerButton">
-							<string key="name">dialerButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="historyButton">
-							<string key="name">historyButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="historyNotificationLabel">
-							<string key="name">historyNotificationLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="historyNotificationView">
-							<string key="name">historyNotificationView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="settingsButton">
-							<string key="name">settingsButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIMainBar.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index dc755cc1d..de7af2a1d 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -613,8 +613,6 @@
 		D354944D160B615A0027E44E /* linphone-splashscreen.png in Resources */ = {isa = PBXBuildFile; fileRef = D354944A160B615A0027E44E /* linphone-splashscreen.png */; };
 		D354944E160B615A0027E44E /* linphone-splashscreen@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D354944B160B615A0027E44E /* linphone-splashscreen@2x.png */; };
 		D354944F160B615A0027E44E /* linphone-splashscreen@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D354944B160B615A0027E44E /* linphone-splashscreen@2x.png */; };
-		D354946C160B75B70027E44E /* chat_address.png in Resources */ = {isa = PBXBuildFile; fileRef = D354946B160B75B70027E44E /* chat_address.png */; };
-		D354946D160B75B70027E44E /* chat_address.png in Resources */ = {isa = PBXBuildFile; fileRef = D354946B160B75B70027E44E /* chat_address.png */; };
 		D35497FE15875372000081D8 /* ContactsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35497FC15875372000081D8 /* ContactsViewController.m */; };
 		D35497FF15875372000081D8 /* ContactsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35497FC15875372000081D8 /* ContactsViewController.m */; };
 		D354980615875534000081D8 /* contacts_all_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D354980215875534000081D8 /* contacts_all_selected.png */; };
@@ -642,6 +640,22 @@
 		D35E7598159460580066B1C1 /* ChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35E7595159460560066B1C1 /* ChatViewController.m */; };
 		D35E759F159460B70066B1C1 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35E759D159460B50066B1C1 /* SettingsViewController.m */; };
 		D35E75A0159460B70066B1C1 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35E759D159460B50066B1C1 /* SettingsViewController.m */; };
+		D35E91EA160CA0BD0023116B /* field_background.9@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D35E91E9160CA0BD0023116B /* field_background.9@2x.png */; };
+		D35E91EB160CA0BD0023116B /* field_background.9@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D35E91E9160CA0BD0023116B /* field_background.9@2x.png */; };
+		D35E91EE160CA0C70023116B /* button_background_default.9@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D35E91EC160CA0C70023116B /* button_background_default.9@2x.png */; };
+		D35E91EF160CA0C70023116B /* button_background_default.9@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D35E91EC160CA0C70023116B /* button_background_default.9@2x.png */; };
+		D35E91F0160CA0C70023116B /* button_background_over.9@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D35E91ED160CA0C70023116B /* button_background_over.9@2x.png */; };
+		D35E91F1160CA0C70023116B /* button_background_over.9@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D35E91ED160CA0C70023116B /* button_background_over.9@2x.png */; };
+		D35E91F4160CA10B0023116B /* UILinphoneTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = D35E91F3160CA10B0023116B /* UILinphoneTextField.m */; };
+		D35E91F5160CA10B0023116B /* UILinphoneTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = D35E91F3160CA10B0023116B /* UILinphoneTextField.m */; };
+		D35E91F8160CA4FF0023116B /* UILinphoneButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D35E91F7160CA4FF0023116B /* UILinphoneButton.m */; };
+		D35E91F9160CA4FF0023116B /* UILinphoneButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D35E91F7160CA4FF0023116B /* UILinphoneButton.m */; };
+		D35E9209160CAA1F0023116B /* field_background.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D35E9208160CAA1F0023116B /* field_background.9.png */; };
+		D35E920A160CAA1F0023116B /* field_background.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D35E9208160CAA1F0023116B /* field_background.9.png */; };
+		D35E920D160CABD70023116B /* button_background_default.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D35E920B160CABD70023116B /* button_background_default.9.png */; };
+		D35E920E160CABD70023116B /* button_background_default.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D35E920B160CABD70023116B /* button_background_default.9.png */; };
+		D35E920F160CABD70023116B /* button_background_over.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D35E920C160CABD70023116B /* button_background_over.9.png */; };
+		D35E9210160CABD70023116B /* button_background_over.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D35E920C160CABD70023116B /* button_background_over.9.png */; };
 		D35EA76315A2DF8D003E025D /* micro_off_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D35EA76115A2DF8D003E025D /* micro_off_disabled.png */; };
 		D35EA76515A2DF8D003E025D /* micro_on_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D35EA76215A2DF8D003E025D /* micro_on_disabled.png */; };
 		D365AA7B15A2DE7500CAFE3F /* speaker_off_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D365AA7915A2DE7500CAFE3F /* speaker_off_disabled.png */; };
@@ -1726,7 +1740,6 @@
 		D35406F615A47E9E007E7E81 /* button_background_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = button_background_over.png; path = Resources/button_background_over.png; sourceTree = "<group>"; };
 		D354944A160B615A0027E44E /* linphone-splashscreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-splashscreen.png"; path = "Resources/linphone-splashscreen.png"; sourceTree = "<group>"; };
 		D354944B160B615A0027E44E /* linphone-splashscreen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-splashscreen@2x.png"; path = "Resources/linphone-splashscreen@2x.png"; sourceTree = "<group>"; };
-		D354946B160B75B70027E44E /* chat_address.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_address.png; path = Resources/chat_address.png; sourceTree = "<group>"; };
 		D35497FB15875372000081D8 /* ContactsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactsViewController.h; sourceTree = "<group>"; };
 		D35497FC15875372000081D8 /* ContactsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ContactsViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		D354980215875534000081D8 /* contacts_all_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_all_selected.png; path = Resources/contacts_all_selected.png; sourceTree = "<group>"; };
@@ -1754,6 +1767,16 @@
 		D35E7595159460560066B1C1 /* ChatViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatViewController.m; sourceTree = "<group>"; };
 		D35E759C159460B50066B1C1 /* SettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsViewController.h; sourceTree = "<group>"; };
 		D35E759D159460B50066B1C1 /* SettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsViewController.m; sourceTree = "<group>"; };
+		D35E91E9160CA0BD0023116B /* field_background.9@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "field_background.9@2x.png"; path = "Resources/field_background.9@2x.png"; sourceTree = "<group>"; };
+		D35E91EC160CA0C70023116B /* button_background_default.9@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "button_background_default.9@2x.png"; path = "Resources/button_background_default.9@2x.png"; sourceTree = "<group>"; };
+		D35E91ED160CA0C70023116B /* button_background_over.9@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "button_background_over.9@2x.png"; path = "Resources/button_background_over.9@2x.png"; sourceTree = "<group>"; };
+		D35E91F2160CA10B0023116B /* UILinphoneTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILinphoneTextField.h; sourceTree = "<group>"; };
+		D35E91F3160CA10B0023116B /* UILinphoneTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UILinphoneTextField.m; sourceTree = "<group>"; };
+		D35E91F6160CA4FF0023116B /* UILinphoneButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILinphoneButton.h; sourceTree = "<group>"; };
+		D35E91F7160CA4FF0023116B /* UILinphoneButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UILinphoneButton.m; sourceTree = "<group>"; };
+		D35E9208160CAA1F0023116B /* field_background.9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = field_background.9.png; path = Resources/field_background.9.png; sourceTree = "<group>"; };
+		D35E920B160CABD70023116B /* button_background_default.9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = button_background_default.9.png; path = Resources/button_background_default.9.png; sourceTree = "<group>"; };
+		D35E920C160CABD70023116B /* button_background_over.9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = button_background_over.9.png; path = Resources/button_background_over.9.png; sourceTree = "<group>"; };
 		D35EA76115A2DF8D003E025D /* micro_off_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = micro_off_disabled.png; path = Resources/micro_off_disabled.png; sourceTree = "<group>"; };
 		D35EA76215A2DF8D003E025D /* micro_on_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = micro_on_disabled.png; path = Resources/micro_on_disabled.png; sourceTree = "<group>"; };
 		D365AA7915A2DE7500CAFE3F /* speaker_off_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = speaker_off_disabled.png; path = Resources/speaker_off_disabled.png; sourceTree = "<group>"; };
@@ -2663,6 +2686,10 @@
 				D31AC4AF158A29C600C2638B /* UIHistoryCell.xib */,
 				D3E84F3C15B018A600420DAC /* UILinphone.h */,
 				D380800415C28A7A005BE9BC /* UILinphone.m */,
+				D35E91F6160CA4FF0023116B /* UILinphoneButton.h */,
+				D35E91F7160CA4FF0023116B /* UILinphoneButton.m */,
+				D35E91F2160CA10B0023116B /* UILinphoneTextField.h */,
+				D35E91F3160CA10B0023116B /* UILinphoneTextField.m */,
 				D32409C1158B49A600C8C119 /* UILongTouchButton.h */,
 				D32409C2158B49A600C8C119 /* UILongTouchButton.m */,
 				D3ED3E841586291B006C0DE4 /* UIMainBar.h */,
@@ -2881,7 +2908,11 @@
 				D3F5F8D91609A86700D3DA1A /* bubble.png */,
 				D32D5AA515ADE5D9008593F3 /* button_alert_background_default.png */,
 				D32D5AA615ADE5D9008593F3 /* button_alert_background_over.png */,
+				D35E920B160CABD70023116B /* button_background_default.9.png */,
+				D35E91EC160CA0C70023116B /* button_background_default.9@2x.png */,
 				D35406F515A47E9E007E7E81 /* button_background_default.png */,
+				D35E920C160CABD70023116B /* button_background_over.9.png */,
+				D35E91ED160CA0C70023116B /* button_background_over.9@2x.png */,
 				D35406F615A47E9E007E7E81 /* button_background_over.png */,
 				D3ED3E7015861ABD006C0DE4 /* call_default.png */,
 				D3A74E6B15C69392001500B9 /* call_default~ipad.png */,
@@ -2913,7 +2944,6 @@
 				D36C43CD158F2F370048BA40 /* cell_conference.png */,
 				D3EA5401159852080037DC6B /* chat_add_default.png */,
 				D3EA5402159852080037DC6B /* chat_add_over.png */,
-				D354946B160B75B70027E44E /* chat_address.png */,
 				D3F795DB15A5831C0077328B /* chat_back_default.png */,
 				D3F795DC15A5831C0077328B /* chat_back_over.png */,
 				D389363715A6D53200A3A3AA /* chat_bubble_incoming.9.png */,
@@ -3013,6 +3043,8 @@
 				D38327ED1580FE3A00FA0D23 /* dialer_default.png */,
 				D38327EE1580FE3A00FA0D23 /* dialer_over.png */,
 				D3C2814A15A2D38D0098AA42 /* dialer_selected.png */,
+				D35E9208160CAA1F0023116B /* field_background.9.png */,
+				D35E91E9160CA0BD0023116B /* field_background.9@2x.png */,
 				D350F21715A43D3400149E54 /* field_background.png */,
 				D3F5F8E01609A86700D3DA1A /* form_invalid.png */,
 				D3F5F8E11609A86700D3DA1A /* form_valid.png */,
@@ -4062,8 +4094,13 @@
 				D332864C160B5BC300E6435D /* dialer_alt_disabled~ipad.png in Resources */,
 				D354944C160B615A0027E44E /* linphone-splashscreen.png in Resources */,
 				D354944E160B615A0027E44E /* linphone-splashscreen@2x.png in Resources */,
-				D354946C160B75B70027E44E /* chat_address.png in Resources */,
 				D38F46F2160C5CC8002D4C4A /* linphone-splashscreen-568h@2x.png in Resources */,
+				D35E91EA160CA0BD0023116B /* field_background.9@2x.png in Resources */,
+				D35E91EE160CA0C70023116B /* button_background_default.9@2x.png in Resources */,
+				D35E91F0160CA0C70023116B /* button_background_over.9@2x.png in Resources */,
+				D35E9209160CAA1F0023116B /* field_background.9.png in Resources */,
+				D35E920D160CABD70023116B /* button_background_default.9.png in Resources */,
+				D35E920F160CABD70023116B /* button_background_over.9.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4547,8 +4584,13 @@
 				D332864D160B5BC300E6435D /* dialer_alt_disabled~ipad.png in Resources */,
 				D354944D160B615A0027E44E /* linphone-splashscreen.png in Resources */,
 				D354944F160B615A0027E44E /* linphone-splashscreen@2x.png in Resources */,
-				D354946D160B75B70027E44E /* chat_address.png in Resources */,
 				D38F46F3160C5CC8002D4C4A /* linphone-splashscreen-568h@2x.png in Resources */,
+				D35E91EB160CA0BD0023116B /* field_background.9@2x.png in Resources */,
+				D35E91EF160CA0C70023116B /* button_background_default.9@2x.png in Resources */,
+				D35E91F1160CA0C70023116B /* button_background_over.9@2x.png in Resources */,
+				D35E920A160CAA1F0023116B /* field_background.9.png in Resources */,
+				D35E920E160CABD70023116B /* button_background_default.9.png in Resources */,
+				D35E9210160CABD70023116B /* button_background_over.9.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4675,6 +4717,8 @@
 				D3ED401B1602172200BF332B /* HPTextViewInternal.m in Sources */,
 				D37EE162160377D7003608A6 /* DTActionSheet.m in Sources */,
 				D374D3FD16071762003D25FF /* ImageSharing.m in Sources */,
+				D35E91F4160CA10B0023116B /* UILinphoneTextField.m in Sources */,
+				D35E91F8160CA4FF0023116B /* UILinphoneButton.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4769,6 +4813,8 @@
 				D3ED401C1602172200BF332B /* HPTextViewInternal.m in Sources */,
 				D37EE163160377D7003608A6 /* DTActionSheet.m in Sources */,
 				D374D3FE16071762003D25FF /* ImageSharing.m in Sources */,
+				D35E91F5160CA10B0023116B /* UILinphoneTextField.m in Sources */,
+				D35E91F9160CA4FF0023116B /* UILinphoneButton.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};