diff --git a/Classes/IncallViewController.m b/Classes/IncallViewController.m
index 8a961044b..25e82ebe9 100644
--- a/Classes/IncallViewController.m
+++ b/Classes/IncallViewController.m
@@ -90,8 +90,8 @@ int callCount(LinphoneCore* lc) {
 - (void)viewDidLoad {
     [super viewDidLoad];
 	//Controls
-	[mute initWithOnImage:[UIImage imageNamed:@"mic_muted.png"]  offImage:[UIImage imageNamed:@"mic_active.png"] ];
-    [speaker initWithOnImage:[UIImage imageNamed:@"Speaker-32-on.png"]  offImage:[UIImage imageNamed:@"Speaker-32-off.png"] ];
+	[mute initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"]  offImage:[UIImage imageNamed:@"micro.png"] ];
+    [speaker initWithOnImage:[UIImage imageNamed:@"HP_inverse.png"]  offImage:[UIImage imageNamed:@"HP.png"] ];
 	
 
 	//Dialer init
@@ -139,10 +139,13 @@ int callCount(LinphoneCore* lc) {
 -(void) pauseCallPressed {
     if (!selectedCall)
         return;
-    if (linphone_call_get_state(selectedCall) == LinphoneCallPaused)
+    if (linphone_call_get_state(selectedCall) == LinphoneCallPaused) {
+        [pause setSelected:NO];
         linphone_core_resume_call([LinphoneManager getLc], selectedCall);
-    else
+    }else{
         linphone_core_pause_call([LinphoneManager getLc], selectedCall);
+        [pause setSelected:YES];
+    }
 }
 
 
@@ -261,12 +264,12 @@ int callCount(LinphoneCore* lc) {
         else if (linphone_call_get_state(selectedCall)==LinphoneCallPaused) {
             [pause setHidden:NO];
             //[pause setTitle:@"Resume" forState:UIControlStateNormal];
-            pause.selected = YES;
+            // pause.selected = YES;
             pause.highlighted = NO;
         } else if (callCount(lc) == callsCount && callsCount == 1) {
             [pause setHidden:NO];
             //[pause setTitle:@"Pause" forState:UIControlStateNormal];
-            pause.selected = NO;
+            // pause.selected = NO;
             pause.highlighted = NO;
         } else {
             [pause setHidden:YES];
@@ -493,7 +496,7 @@ int callCount(LinphoneCore* lc) {
         [self updateCell:cell at:indexPath withCall: [self retrieveCallAtIndex:indexPath.row inConference:NO]
             conferenceActive:linphone_core_is_in_conference(lc)];
 
-    cell.userInteractionEnabled = YES;
+    cell.userInteractionEnabled = YES; 
     cell.selectionStyle = UITableViewCellSelectionStyleNone;
     //cell.selectionStyle = UITableViewCellSelectionStyleBlue;
     
@@ -503,7 +506,7 @@ int callCount(LinphoneCore* lc) {
     UIImage *theImage = [UIImage imageWithContentsOfFile:path];
     cell.imageView.image = theImage;*/
     return cell;
-}
+} 
 
 
 // UITableViewDataSource (required)
diff --git a/Classes/IncallViewController.xib b/Classes/IncallViewController.xib
index a77415f09..678052028 100644
--- a/Classes/IncallViewController.xib
+++ b/Classes/IncallViewController.xib
@@ -13,9 +13,9 @@
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<string>IBUIViewController</string>
-			<string>IBUITableView</string>
-			<string>IBUIView</string>
 			<string>IBUIButton</string>
+			<string>IBUIView</string>
+			<string>IBUITableView</string>
 			<string>IBProxyObject</string>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
@@ -45,14 +45,14 @@
 						<object class="IBUITableView" id="662692377">
 							<reference key="NSNextResponder" ref="858247959"/>
 							<int key="NSvFlags">274</int>
-							<string key="NSFrameSize">{320, 276}</string>
+							<string key="NSFrameSize">{320, 251}</string>
 							<reference key="NSSuperview" ref="858247959"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="585669622"/>
+							<reference key="NSNextKeyView" ref="759087764"/>
 							<string key="NSReuseIdentifierKey">_NS:418</string>
-							<object class="NSColor" key="IBUIBackgroundColor" id="1039157006">
+							<object class="NSColor" key="IBUIBackgroundColor" id="95762599">
 								<int key="NSColorSpace">3</int>
-								<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+								<bytes key="NSWhite">MCAwAA</bytes>
 							</object>
 							<bool key="IBUIClipsSubviews">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -72,10 +72,10 @@
 								<object class="IBUIButton" id="953411930">
 									<reference key="NSNextResponder" ref="30856702"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{36, 8}, {248, 52}}</string>
+									<string key="NSFrame">{{0, 1}, {320, 66}}</string>
 									<reference key="NSSuperview" ref="30856702"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="759087764"/>
+									<reference key="NSNextKeyView"/>
 									<object class="NSColor" key="IBUIBackgroundColor">
 										<int key="NSColorSpace">1</int>
 										<bytes key="NSRGB">MSAwIDAuMDgyMzIwMjU5MDQgMC4xOAA</bytes>
@@ -101,6 +101,10 @@
 										<string key="NSClassName">NSImage</string>
 										<string key="NSResourceName">stopcall-red.png</string>
 									</object>
+									<object class="NSCustomResource" key="IBUINormalBackgroundImage">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">clavier-01-106px.png</string>
+									</object>
 									<object class="IBUIFontDescription" key="IBUIFontDescription" id="126521792">
 										<string key="name">Helvetica-Bold</string>
 										<string key="family">Helvetica</string>
@@ -114,15 +118,12 @@
 									</object>
 								</object>
 							</object>
-							<string key="NSFrame">{{0, 392}, {320, 68}}</string>
+							<string key="NSFrame">{{0, 393.5}, {320, 77}}</string>
 							<reference key="NSSuperview" ref="858247959"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="953411930"/>
 							<string key="NSReuseIdentifierKey">_NS:196</string>
-							<object class="NSColor" key="IBUIBackgroundColor" id="612288095">
-								<int key="NSColorSpace">3</int>
-								<bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes>
-							</object>
+							<reference key="IBUIBackgroundColor" ref="95762599"/>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<object class="IBUIView" id="585669622">
@@ -133,11 +134,11 @@
 								<object class="IBUIButton" id="1031005817">
 									<reference key="NSNextResponder" ref="585669622"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{119, 58}, {82, 52}}</string>
+									<string key="NSFrame">{{107, 70}, {106, 66}}</string>
 									<reference key="NSSuperview" ref="585669622"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="603015724"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="NSNextKeyView" ref="478667533"/>
+									<reference key="IBUIBackgroundColor" ref="95762599"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -149,11 +150,14 @@
 										<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
 									</object>
 									<reference key="IBUINormalTitleShadowColor" ref="785445938"/>
-									<object class="NSCustomResource" key="IBUIDisabledImage" id="274063389">
+									<object class="NSCustomResource" key="IBUIDisabledImage">
 										<string key="NSClassName">NSImage</string>
 										<string key="NSResourceName">conf_merge.png</string>
 									</object>
-									<reference key="IBUINormalImage" ref="274063389"/>
+									<object class="NSCustomResource" key="IBUINormalImage">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">grouper.png</string>
+									</object>
 									<object class="IBUIFontDescription" key="IBUIFontDescription" id="987072261">
 										<int key="type">2</int>
 										<double key="pointSize">17</double>
@@ -167,11 +171,11 @@
 								<object class="IBUIButton" id="861550739">
 									<reference key="NSNextResponder" ref="585669622"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{36, 5}, {82, 52}}</string>
+									<string key="NSFrame">{{0, 4}, {107, 66}}</string>
 									<reference key="NSSuperview" ref="585669622"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="752456321"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="IBUIBackgroundColor" ref="95762599"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -187,6 +191,14 @@
 										<string key="NSClassName">NSImage</string>
 										<string key="NSResourceName">mic_active.png</string>
 									</object>
+									<object class="NSCustomResource" key="IBUISelectedImage">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">micro_inverse.png</string>
+									</object>
+									<object class="NSCustomResource" key="IBUINormalImage">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">micro.png</string>
+									</object>
 									<object class="IBUIFontDescription" key="IBUIFontDescription" id="974614377">
 										<int key="type">2</int>
 										<int key="size">2</int>
@@ -200,11 +212,11 @@
 								<object class="IBUIButton" id="297000325">
 									<reference key="NSNextResponder" ref="585669622"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{36, 58}, {82, 52}}</string>
+									<string key="NSFrame">{{0, 70}, {107, 66}}</string>
 									<reference key="NSSuperview" ref="585669622"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="1031005817"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="NSNextKeyView" ref="603015724"/>
+									<reference key="IBUIBackgroundColor" ref="95762599"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -218,7 +230,7 @@
 									<reference key="IBUINormalTitleShadowColor" ref="785445938"/>
 									<object class="NSCustomResource" key="IBUINormalImage">
 										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">addcall-green.png</string>
+										<string key="NSResourceName">ajouter.png</string>
 									</object>
 									<reference key="IBUIFontDescription" ref="974614377"/>
 									<reference key="IBUIFont" ref="773313654"/>
@@ -226,17 +238,16 @@
 								<object class="IBUIButton" id="478667533">
 									<reference key="NSNextResponder" ref="585669622"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{202, 58}, {82, 52}}</string>
+									<string key="NSFrame">{{213, 70}, {107, 66}}</string>
 									<reference key="NSSuperview" ref="585669622"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="30856702"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="IBUIBackgroundColor" ref="95762599"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 									<int key="IBUIContentHorizontalAlignment">0</int>
 									<int key="IBUIContentVerticalAlignment">0</int>
-									<string key="IBUINormalTitle">Cont</string>
 									<reference key="IBUIHighlightedTitleColor" ref="816037173"/>
 									<object class="NSColor" key="IBUINormalTitleColor">
 										<int key="NSColorSpace">1</int>
@@ -248,7 +259,7 @@
 									</object>
 									<object class="NSCustomResource" key="IBUINormalImage">
 										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">contact-orange.png</string>
+										<string key="NSResourceName">contact.png</string>
 									</object>
 									<reference key="IBUIFontDescription" ref="974614377"/>
 									<reference key="IBUIFont" ref="773313654"/>
@@ -256,11 +267,11 @@
 								<object class="IBUIButton" id="752456321">
 									<reference key="NSNextResponder" ref="585669622"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{119, 5}, {82, 52}}</string>
+									<string key="NSFrame">{{107, 4}, {106, 66}}</string>
 									<reference key="NSSuperview" ref="585669622"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="406189871"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="IBUIBackgroundColor" ref="95762599"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -274,7 +285,7 @@
 									<reference key="IBUINormalTitleShadowColor" ref="785445938"/>
 									<object class="NSCustomResource" key="IBUINormalImage">
 										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">numpad.png</string>
+										<string key="NSResourceName">clavier.png</string>
 									</object>
 									<reference key="IBUIFontDescription" ref="974614377"/>
 									<reference key="IBUIFont" ref="773313654"/>
@@ -282,34 +293,41 @@
 								<object class="IBUIButton" id="406189871">
 									<reference key="NSNextResponder" ref="585669622"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{202, 5}, {82, 52}}</string>
+									<string key="NSFrame">{{213, 4}, {107, 66}}</string>
 									<reference key="NSSuperview" ref="585669622"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="297000325"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="IBUIBackgroundColor" ref="95762599"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 									<int key="IBUIContentHorizontalAlignment">0</int>
 									<int key="IBUIContentVerticalAlignment">0</int>
-									<string key="IBUINormalTitle">Spk</string>
 									<reference key="IBUIHighlightedTitleColor" ref="816037173"/>
 									<object class="NSColor" key="IBUINormalTitleColor">
 										<int key="NSColorSpace">1</int>
 										<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
 									</object>
 									<reference key="IBUINormalTitleShadowColor" ref="785445938"/>
+									<object class="NSCustomResource" key="IBUISelectedImage">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">HP_inverse.png</string>
+									</object>
+									<object class="NSCustomResource" key="IBUINormalImage">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">HP.png</string>
+									</object>
 									<reference key="IBUIFontDescription" ref="974614377"/>
 									<reference key="IBUIFont" ref="773313654"/>
 								</object>
 								<object class="IBUIButton" id="603015724">
 									<reference key="NSNextResponder" ref="585669622"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{119, 58}, {82, 52}}</string>
+									<string key="NSFrame">{{107, 70}, {106, 66}}</string>
 									<reference key="NSSuperview" ref="585669622"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="478667533"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="NSNextKeyView" ref="1031005817"/>
+									<reference key="IBUIBackgroundColor" ref="95762599"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -325,21 +343,21 @@
 									<reference key="IBUIDisabledImage" ref="10757430"/>
 									<object class="NSCustomResource" key="IBUISelectedImage">
 										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">resumecall.png</string>
+										<string key="NSResourceName">pause_inactif.png</string>
 									</object>
 									<object class="NSCustomResource" key="IBUINormalImage">
 										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">pausecall.png</string>
+										<string key="NSResourceName">pause.png</string>
 									</object>
 									<reference key="IBUIFontDescription" ref="987072261"/>
 									<reference key="IBUIFont" ref="507550279"/>
 								</object>
 							</object>
-							<string key="NSFrame">{{0, 276}, {320, 115}}</string>
+							<string key="NSFrame">{{0, 258.5}, {320, 135}}</string>
 							<reference key="NSSuperview" ref="858247959"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="861550739"/>
-							<reference key="IBUIBackgroundColor" ref="612288095"/>
+							<reference key="IBUIBackgroundColor" ref="95762599"/>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -352,17 +370,17 @@
 								<object class="IBUIButton" id="759251781">
 									<reference key="NSNextResponder" ref="759087764"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{95, 219}, {82, 52}}</string>
+									<string key="NSFrame">{{119, 251}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="759087764"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="NSNextKeyView" ref="585669622"/>
+									<reference key="IBUIBackgroundColor" ref="95762599"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 									<int key="IBUIContentHorizontalAlignment">0</int>
 									<int key="IBUIContentVerticalAlignment">0</int>
-									<string key="IBUINormalTitle">Close</string>
+									<string key="IBUINormalTitle">close</string>
 									<reference key="IBUIHighlightedTitleColor" ref="816037173"/>
 									<object class="NSColor" key="IBUINormalTitleColor">
 										<int key="NSColorSpace">1</int>
@@ -375,11 +393,14 @@
 								<object class="IBUIButton" id="583355032">
 									<reference key="NSNextResponder" ref="759087764"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{95, 166}, {82, 52}}</string>
+									<string key="NSFrame">{{119, 193}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="759087764"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="323385706"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<object class="NSColor" key="IBUIBackgroundColor" id="392721472">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+									</object>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -398,11 +419,11 @@
 								<object class="IBUIButton" id="540604734">
 									<reference key="NSNextResponder" ref="759087764"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{12, 7}, {82, 52}}</string>
+									<string key="NSFrame">{{31, 19}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="759087764"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="848096264"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="IBUIBackgroundColor" ref="392721472"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -421,11 +442,11 @@
 								<object class="IBUIButton" id="848096264">
 									<reference key="NSNextResponder" ref="759087764"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{95, 7}, {82, 52}}</string>
+									<string key="NSFrame">{{119, 19}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="759087764"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="1037442441"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="IBUIBackgroundColor" ref="392721472"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -441,11 +462,11 @@
 								<object class="IBUIButton" id="1037442441">
 									<reference key="NSNextResponder" ref="759087764"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{178, 7}, {82, 52}}</string>
+									<string key="NSFrame">{{207, 19}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="759087764"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="652269854"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="IBUIBackgroundColor" ref="392721472"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -464,11 +485,11 @@
 								<object class="IBUIButton" id="652269854">
 									<reference key="NSNextResponder" ref="759087764"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{12, 60}, {82, 52}}</string>
+									<string key="NSFrame">{{31, 77}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="759087764"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="373062361"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="IBUIBackgroundColor" ref="392721472"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -487,11 +508,11 @@
 								<object class="IBUIButton" id="373062361">
 									<reference key="NSNextResponder" ref="759087764"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{95, 60}, {82, 52}}</string>
+									<string key="NSFrame">{{119, 77}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="759087764"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="673101328"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="IBUIBackgroundColor" ref="392721472"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -510,11 +531,11 @@
 								<object class="IBUIButton" id="673101328">
 									<reference key="NSNextResponder" ref="759087764"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{178, 60}, {82, 52}}</string>
+									<string key="NSFrame">{{207, 77}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="759087764"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="313356310"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="IBUIBackgroundColor" ref="392721472"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -533,11 +554,11 @@
 								<object class="IBUIButton" id="313356310">
 									<reference key="NSNextResponder" ref="759087764"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{12, 113}, {82, 52}}</string>
+									<string key="NSFrame">{{31, 135}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="759087764"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="175014683"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="IBUIBackgroundColor" ref="392721472"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -556,11 +577,11 @@
 								<object class="IBUIButton" id="175014683">
 									<reference key="NSNextResponder" ref="759087764"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{95, 113}, {82, 52}}</string>
+									<string key="NSFrame">{{119, 135}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="759087764"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="723131369"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="IBUIBackgroundColor" ref="392721472"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -579,11 +600,11 @@
 								<object class="IBUIButton" id="723131369">
 									<reference key="NSNextResponder" ref="759087764"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{178, 113}, {82, 52}}</string>
+									<string key="NSFrame">{{207, 135}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="759087764"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="256512846"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="IBUIBackgroundColor" ref="392721472"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -602,11 +623,11 @@
 								<object class="IBUIButton" id="256512846">
 									<reference key="NSNextResponder" ref="759087764"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{12, 166}, {82, 52}}</string>
+									<string key="NSFrame">{{31, 193}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="759087764"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="583355032"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="IBUIBackgroundColor" ref="392721472"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -625,11 +646,11 @@
 								<object class="IBUIButton" id="323385706">
 									<reference key="NSNextResponder" ref="759087764"/>
 									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{178, 166}, {82, 52}}</string>
+									<string key="NSFrame">{{207, 193}, {82, 52}}</string>
 									<reference key="NSSuperview" ref="759087764"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="759251781"/>
-									<reference key="IBUIBackgroundColor" ref="1039157006"/>
+									<reference key="IBUIBackgroundColor" ref="392721472"/>
 									<bool key="IBUIOpaque">NO</bool>
 									<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -646,11 +667,14 @@
 									<reference key="IBUIFont" ref="376139125"/>
 								</object>
 							</object>
-							<string key="NSFrame">{{24, 115}, {272, 279}}</string>
+							<string key="NSFrame">{{0, 71}, {320, 310}}</string>
 							<reference key="NSSuperview" ref="858247959"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="540604734"/>
-							<reference key="IBUIBackgroundColor" ref="612288095"/>
+							<object class="NSColor" key="IBUIBackgroundColor">
+								<int key="NSColorSpace">3</int>
+								<bytes key="NSWhite">MC4yNAA</bytes>
+							</object>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -660,10 +684,7 @@
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="662692377"/>
-					<object class="NSColor" key="IBUIBackgroundColor">
-						<int key="NSColorSpace">1</int>
-						<bytes key="NSRGB">MC44MDAwMDAwMTE5IDAuODAwMDAwMDExOSAwLjgwMDAwMDAxMTkAA</bytes>
-					</object>
+					<reference key="IBUIBackgroundColor" ref="392721472"/>
 					<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 					<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				</object>
@@ -687,14 +708,6 @@
 					</object>
 					<int key="connectionID">23</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">callTableView</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="662692377"/>
-					</object>
-					<int key="connectionID">109</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">endCtrl</string>
@@ -703,70 +716,6 @@
 					</object>
 					<int key="connectionID">99</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">addCall</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="297000325"/>
-					</object>
-					<int key="connectionID">112</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">controlSubView</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="585669622"/>
-					</object>
-					<int key="connectionID">44</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">mergeCalls</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="1031005817"/>
-					</object>
-					<int key="connectionID">114</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">speaker</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="406189871"/>
-					</object>
-					<int key="connectionID">82</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">dialer</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="752456321"/>
-					</object>
-					<int key="connectionID">49</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">pause</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="603015724"/>
-					</object>
-					<int key="connectionID">115</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">mute</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="861550739"/>
-					</object>
-					<int key="connectionID">80</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">contacts</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="478667533"/>
-					</object>
-					<int key="connectionID">84</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">star</string>
@@ -887,6 +836,78 @@
 					</object>
 					<int key="connectionID">122</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">callTableView</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="662692377"/>
+					</object>
+					<int key="connectionID">109</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">controlSubView</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="585669622"/>
+					</object>
+					<int key="connectionID">44</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">mute</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="861550739"/>
+					</object>
+					<int key="connectionID">80</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">addCall</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="297000325"/>
+					</object>
+					<int key="connectionID">112</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">dialer</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="752456321"/>
+					</object>
+					<int key="connectionID">49</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">pause</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="603015724"/>
+					</object>
+					<int key="connectionID">115</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">speaker</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="406189871"/>
+					</object>
+					<int key="connectionID">82</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">contacts</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="478667533"/>
+					</object>
+					<int key="connectionID">84</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">mergeCalls</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="1031005817"/>
+					</object>
+					<int key="connectionID">114</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">doAction:</string>
@@ -967,18 +988,13 @@
 						<reference key="object" ref="858247959"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="662692377"/>
 							<reference ref="30856702"/>
-							<reference ref="585669622"/>
 							<reference ref="759087764"/>
+							<reference ref="662692377"/>
+							<reference ref="585669622"/>
 						</object>
 						<reference key="parent" ref="981679694"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">106</int>
-						<reference key="object" ref="662692377"/>
-						<reference key="parent" ref="858247959"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">120</int>
 						<reference key="object" ref="30856702"/>
@@ -994,64 +1010,6 @@
 						<reference key="parent" ref="30856702"/>
 						<string key="objectName">end</string>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">26</int>
-						<reference key="object" ref="585669622"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="603015724"/>
-							<reference ref="406189871"/>
-							<reference ref="752456321"/>
-							<reference ref="478667533"/>
-							<reference ref="297000325"/>
-							<reference ref="861550739"/>
-							<reference ref="1031005817"/>
-						</object>
-						<reference key="parent" ref="858247959"/>
-						<string key="objectName">controls</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">113</int>
-						<reference key="object" ref="603015724"/>
-						<reference key="parent" ref="585669622"/>
-						<string key="objectName">pauseresume</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">13</int>
-						<reference key="object" ref="406189871"/>
-						<reference key="parent" ref="585669622"/>
-						<string key="objectName">speaker</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">17</int>
-						<reference key="object" ref="752456321"/>
-						<reference key="parent" ref="585669622"/>
-						<string key="objectName">dialer</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">15</int>
-						<reference key="object" ref="478667533"/>
-						<reference key="parent" ref="585669622"/>
-						<string key="objectName">contacts</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">111</int>
-						<reference key="object" ref="297000325"/>
-						<reference key="parent" ref="585669622"/>
-						<string key="objectName">addcall</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">16</int>
-						<reference key="object" ref="861550739"/>
-						<reference key="parent" ref="585669622"/>
-						<string key="objectName">mute</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">104</int>
-						<reference key="object" ref="1031005817"/>
-						<reference key="parent" ref="585669622"/>
-						<string key="objectName">merge</string>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">27</int>
 						<reference key="object" ref="759087764"/>
@@ -1061,7 +1019,6 @@
 							<reference ref="540604734"/>
 							<reference ref="175014683"/>
 							<reference ref="323385706"/>
-							<reference ref="373062361"/>
 							<reference ref="759251781"/>
 							<reference ref="848096264"/>
 							<reference ref="583355032"/>
@@ -1070,6 +1027,7 @@
 							<reference ref="673101328"/>
 							<reference ref="313356310"/>
 							<reference ref="723131369"/>
+							<reference ref="373062361"/>
 						</object>
 						<reference key="parent" ref="858247959"/>
 						<string key="objectName">pad</string>
@@ -1152,6 +1110,69 @@
 						<reference key="parent" ref="759087764"/>
 						<string key="objectName">9</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">106</int>
+						<reference key="object" ref="662692377"/>
+						<reference key="parent" ref="858247959"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">26</int>
+						<reference key="object" ref="585669622"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="603015724"/>
+							<reference ref="406189871"/>
+							<reference ref="752456321"/>
+							<reference ref="478667533"/>
+							<reference ref="297000325"/>
+							<reference ref="861550739"/>
+							<reference ref="1031005817"/>
+						</object>
+						<reference key="parent" ref="858247959"/>
+						<string key="objectName">controls</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">113</int>
+						<reference key="object" ref="603015724"/>
+						<reference key="parent" ref="585669622"/>
+						<string key="objectName">pauseresume</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">13</int>
+						<reference key="object" ref="406189871"/>
+						<reference key="parent" ref="585669622"/>
+						<string key="objectName">speaker</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">17</int>
+						<reference key="object" ref="752456321"/>
+						<reference key="parent" ref="585669622"/>
+						<string key="objectName">dialer</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="478667533"/>
+						<reference key="parent" ref="585669622"/>
+						<string key="objectName">contacts</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">111</int>
+						<reference key="object" ref="297000325"/>
+						<reference key="parent" ref="585669622"/>
+						<string key="objectName">addcall</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">16</int>
+						<reference key="object" ref="861550739"/>
+						<reference key="parent" ref="585669622"/>
+						<string key="objectName">mute</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">104</int>
+						<reference key="object" ref="1031005817"/>
+						<reference key="parent" ref="585669622"/>
+						<string key="objectName">merge</string>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1172,6 +1193,7 @@
 					<string>120.IBPluginDependency</string>
 					<string>13.CustomClassName</string>
 					<string>13.IBPluginDependency</string>
+					<string>13.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
 					<string>15.IBPluginDependency</string>
 					<string>16.CustomClassName</string>
 					<string>16.IBPluginDependency</string>
@@ -1204,6 +1226,7 @@
 					<string>39.IBPluginDependency</string>
 					<string>40.CustomClassName</string>
 					<string>40.IBPluginDependency</string>
+					<string>40.IBUIButtonInspectorSelectedStateConfigurationMetadataKey</string>
 					<string>41.CustomClassName</string>
 					<string>41.IBPluginDependency</string>
 					<string>9.IBPluginDependency</string>
@@ -1220,14 +1243,15 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<real value="0.0"/>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<real value="2"/>
+					<real value="0.0"/>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UISpeakerButton</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<real value="2"/>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UIMuteButton</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<real value="0.0"/>
+					<real value="2"/>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -1256,6 +1280,7 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UIDigitButton</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<real value="2"/>
 					<string>UIDigitButton</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -1554,24 +1579,36 @@
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<object class="NSArray" key="dict.sortedKeys">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>addcall-green.png</string>
+				<string>HP.png</string>
+				<string>HP_inverse.png</string>
+				<string>ajouter.png</string>
+				<string>clavier-01-106px.png</string>
+				<string>clavier.png</string>
 				<string>conf_merge.png</string>
-				<string>contact-orange.png</string>
+				<string>contact.png</string>
+				<string>grouper.png</string>
 				<string>mic_active.png</string>
-				<string>numpad.png</string>
-				<string>pausecall.png</string>
-				<string>resumecall.png</string>
+				<string>micro.png</string>
+				<string>micro_inverse.png</string>
+				<string>pause.png</string>
+				<string>pause_inactif.png</string>
 				<string>stopcall-red.png</string>
 			</object>
 			<object class="NSMutableArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{82, 71}</string>
+				<string>{164, 104}</string>
+				<string>{164, 104}</string>
+				<string>{164, 104}</string>
+				<string>{106, 60}</string>
+				<string>{164, 104}</string>
 				<string>{82, 75}</string>
-				<string>{25, 23}</string>
+				<string>{164, 104}</string>
+				<string>{164, 104}</string>
 				<string>{82, 82}</string>
-				<string>{82, 82}</string>
-				<string>{82, 75}</string>
-				<string>{82, 75}</string>
+				<string>{164, 104}</string>
+				<string>{164, 104}</string>
+				<string>{164, 104}</string>
+				<string>{164, 104}</string>
 				<string>{62, 54}</string>
 			</object>
 		</object>
diff --git a/Classes/PhoneViewController.xib b/Classes/PhoneViewController.xib
index 385db8b02..be02b22e2 100644
--- a/Classes/PhoneViewController.xib
+++ b/Classes/PhoneViewController.xib
@@ -59,7 +59,6 @@
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 									<int key="IBUIContentHorizontalAlignment">0</int>
 									<int key="IBUIContentVerticalAlignment">0</int>
-									<string key="IBUINormalTitle">&lt;-</string>
 									<object class="NSColor" key="IBUIHighlightedTitleColor" id="923326808">
 										<int key="NSColorSpace">3</int>
 										<bytes key="NSWhite">MQA</bytes>
@@ -72,9 +71,9 @@
 										<int key="NSColorSpace">3</int>
 										<bytes key="NSWhite">MC41AA</bytes>
 									</object>
-									<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="553476442">
+									<object class="NSCustomResource" key="IBUINormalImage">
 										<string key="NSClassName">NSImage</string>
-										<string key="NSResourceName">clavier-01-106px.png</string>
+										<string key="NSResourceName">effacer.png</string>
 									</object>
 									<object class="IBUIFontDescription" key="IBUIFontDescription" id="857420967">
 										<string key="name">Helvetica-Bold</string>
@@ -216,7 +215,10 @@
 								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
 							</object>
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<reference key="IBUINormalBackgroundImage" ref="553476442"/>
+							<object class="NSCustomResource" key="IBUINormalBackgroundImage" id="393925159">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">clavier-01-106px.png</string>
+							</object>
 							<reference key="IBUIFontDescription" ref="857420967"/>
 							<reference key="IBUIFont" ref="657314226"/>
 						</object>
@@ -239,7 +241,7 @@
 								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
 							</object>
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<reference key="IBUINormalBackgroundImage" ref="553476442"/>
+							<reference key="IBUINormalBackgroundImage" ref="393925159"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
 							<reference key="IBUIFont" ref="657314226"/>
 						</object>
@@ -288,7 +290,7 @@
 								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
 							</object>
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<reference key="IBUINormalBackgroundImage" ref="553476442"/>
+							<reference key="IBUINormalBackgroundImage" ref="393925159"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
 							<reference key="IBUIFont" ref="657314226"/>
 						</object>
@@ -311,7 +313,7 @@
 								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
 							</object>
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<reference key="IBUINormalBackgroundImage" ref="553476442"/>
+							<reference key="IBUINormalBackgroundImage" ref="393925159"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
 							<reference key="IBUIFont" ref="657314226"/>
 						</object>
@@ -334,7 +336,7 @@
 								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
 							</object>
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<reference key="IBUINormalBackgroundImage" ref="553476442"/>
+							<reference key="IBUINormalBackgroundImage" ref="393925159"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
 							<reference key="IBUIFont" ref="657314226"/>
 						</object>
@@ -384,7 +386,7 @@
 								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
 							</object>
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<reference key="IBUINormalBackgroundImage" ref="553476442"/>
+							<reference key="IBUINormalBackgroundImage" ref="393925159"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
 							<reference key="IBUIFont" ref="657314226"/>
 						</object>
@@ -407,7 +409,7 @@
 								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
 							</object>
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<reference key="IBUINormalBackgroundImage" ref="553476442"/>
+							<reference key="IBUINormalBackgroundImage" ref="393925159"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
 							<reference key="IBUIFont" ref="657314226"/>
 						</object>
@@ -453,7 +455,7 @@
 								<bytes key="NSRGB">MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA</bytes>
 							</object>
 							<reference key="IBUINormalTitleShadowColor" ref="177190558"/>
-							<reference key="IBUINormalBackgroundImage" ref="553476442"/>
+							<reference key="IBUINormalBackgroundImage" ref="393925159"/>
 							<reference key="IBUIFontDescription" ref="857420967"/>
 							<reference key="IBUIFont" ref="657314226"/>
 						</object>
@@ -1346,6 +1348,7 @@
 				<string>clavier-01-106px.png</string>
 				<string>clavier-01-108px.png</string>
 				<string>clavier-01-160px.png</string>
+				<string>effacer.png</string>
 				<string>startcall-green.png</string>
 				<string>stopcall-red.png</string>
 			</object>
@@ -1354,6 +1357,7 @@
 				<string>{106, 60}</string>
 				<string>{108, 60}</string>
 				<string>{160, 60}</string>
+				<string>{164, 104}</string>
 				<string>{60, 52}</string>
 				<string>{62, 54}</string>
 			</object>
diff --git a/PhoneMainView.xib b/PhoneMainView.xib
index 1eb8dfbfc..8f1c9a54f 100644
--- a/PhoneMainView.xib
+++ b/PhoneMainView.xib
@@ -65,12 +65,18 @@
 				</object>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<bool key="IBUIHorizontal">NO</bool>
-				<object class="IBUIViewController" key="IBUISelectedViewController" id="383050823">
-					<object class="IBUITabBarItem" key="IBUITabBarItem" id="672878446">
+				<object class="IBUIViewController" key="IBUISelectedViewController" id="156830991">
+					<string key="IBUITitle">History</string>
+					<object class="IBUITabBarItem" key="IBUITabBarItem" id="1041279701">
+						<string key="IBUITitle">History</string>
+						<object class="NSCustomResource" key="IBUIImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">history-orange.png</string>
+						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUISystemItemIdentifier">5</int>
 					</object>
 					<reference key="IBUIParentViewController" ref="952473143"/>
+					<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
 					<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
 						<int key="IBUIInterfaceOrientation">1</int>
 						<int key="interfaceOrientation">1</int>
@@ -80,25 +86,7 @@
 				</object>
 				<object class="NSMutableArray" key="IBUIViewControllers">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBUIViewController" id="156830991">
-						<string key="IBUITitle">History</string>
-						<object class="IBUITabBarItem" key="IBUITabBarItem" id="1041279701">
-							<string key="IBUITitle">History</string>
-							<object class="NSCustomResource" key="IBUIImage">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">history-orange.png</string>
-							</object>
-							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						</object>
-						<reference key="IBUIParentViewController" ref="952473143"/>
-						<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-						<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-							<int key="IBUIInterfaceOrientation">1</int>
-							<int key="interfaceOrientation">1</int>
-						</object>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<bool key="IBUIHorizontal">NO</bool>
-					</object>
+					<reference ref="156830991"/>
 					<object class="IBUIViewController" id="258574391">
 						<object class="IBUITabBarItem" key="IBUITabBarItem" id="64474689">
 							<string key="IBUITitle">Dialer</string>
@@ -118,7 +106,19 @@
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<bool key="IBUIHorizontal">NO</bool>
 					</object>
-					<reference ref="383050823"/>
+					<object class="IBUIViewController" id="383050823">
+						<object class="IBUITabBarItem" key="IBUITabBarItem" id="672878446">
+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+							<int key="IBUISystemItemIdentifier">5</int>
+						</object>
+						<reference key="IBUIParentViewController" ref="952473143"/>
+						<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+							<int key="IBUIInterfaceOrientation">1</int>
+							<int key="interfaceOrientation">1</int>
+						</object>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<bool key="IBUIHorizontal">NO</bool>
+					</object>
 					<object class="IBUIViewController" id="555899988">
 						<object class="IBUITabBarItem" key="IBUITabBarItem" id="534357631">
 							<string key="IBUITitle"/>
@@ -357,7 +357,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">47</int>
+			<int key="maxID">48</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
diff --git a/Resources/HP.png b/Resources/HP.png
new file mode 100755
index 000000000..95d132189
Binary files /dev/null and b/Resources/HP.png differ
diff --git a/Resources/HP_inverse.png b/Resources/HP_inverse.png
new file mode 100755
index 000000000..e343dba73
Binary files /dev/null and b/Resources/HP_inverse.png differ
diff --git a/Resources/ajouter.png b/Resources/ajouter.png
new file mode 100755
index 000000000..c1526d8ba
Binary files /dev/null and b/Resources/ajouter.png differ
diff --git a/Resources/clavier.png b/Resources/clavier.png
new file mode 100755
index 000000000..3d2d9495b
Binary files /dev/null and b/Resources/clavier.png differ
diff --git a/Resources/contact.png b/Resources/contact.png
new file mode 100755
index 000000000..ecf2b1603
Binary files /dev/null and b/Resources/contact.png differ
diff --git a/Resources/effacer.png b/Resources/effacer.png
new file mode 100755
index 000000000..685c72cbb
Binary files /dev/null and b/Resources/effacer.png differ
diff --git a/Resources/grouper.png b/Resources/grouper.png
new file mode 100755
index 000000000..70ed3cbc7
Binary files /dev/null and b/Resources/grouper.png differ
diff --git a/Resources/micro.png b/Resources/micro.png
new file mode 100755
index 000000000..7c694fbff
Binary files /dev/null and b/Resources/micro.png differ
diff --git a/Resources/micro_inverse.png b/Resources/micro_inverse.png
new file mode 100755
index 000000000..dc38d85a6
Binary files /dev/null and b/Resources/micro_inverse.png differ
diff --git a/Resources/pause.png b/Resources/pause.png
new file mode 100755
index 000000000..37d96580b
Binary files /dev/null and b/Resources/pause.png differ
diff --git a/Resources/pause_inactif.png b/Resources/pause_inactif.png
new file mode 100755
index 000000000..0b46f283c
Binary files /dev/null and b/Resources/pause_inactif.png differ
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 2c15008f4..78f7f6fb4 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -84,6 +84,17 @@
 		346A75C814619F73005C9D07 /* IncallViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 222A483212F7176F0075F07F /* IncallViewController.m */; };
 		346A75CF14628F02005C9D07 /* UIPauseResumeButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 346A75CE14628F02005C9D07 /* UIPauseResumeButton.m */; };
 		346A75D21462A786005C9D07 /* CallDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 346A75D11462A786005C9D07 /* CallDelegate.m */; };
+		34AB0AA914714D8700CA32CC /* ajouter.png in Resources */ = {isa = PBXBuildFile; fileRef = 34AB0A9E14714D8700CA32CC /* ajouter.png */; };
+		34AB0AAA14714D8700CA32CC /* clavier.png in Resources */ = {isa = PBXBuildFile; fileRef = 34AB0A9F14714D8700CA32CC /* clavier.png */; };
+		34AB0AAB14714D8700CA32CC /* contact.png in Resources */ = {isa = PBXBuildFile; fileRef = 34AB0AA014714D8700CA32CC /* contact.png */; };
+		34AB0AAC14714D8700CA32CC /* effacer.png in Resources */ = {isa = PBXBuildFile; fileRef = 34AB0AA114714D8700CA32CC /* effacer.png */; };
+		34AB0AAD14714D8700CA32CC /* grouper.png in Resources */ = {isa = PBXBuildFile; fileRef = 34AB0AA214714D8700CA32CC /* grouper.png */; };
+		34AB0AAE14714D8700CA32CC /* HP_inverse.png in Resources */ = {isa = PBXBuildFile; fileRef = 34AB0AA314714D8700CA32CC /* HP_inverse.png */; };
+		34AB0AAF14714D8700CA32CC /* HP.png in Resources */ = {isa = PBXBuildFile; fileRef = 34AB0AA414714D8700CA32CC /* HP.png */; };
+		34AB0AB014714D8700CA32CC /* micro_inverse.png in Resources */ = {isa = PBXBuildFile; fileRef = 34AB0AA514714D8700CA32CC /* micro_inverse.png */; };
+		34AB0AB114714D8700CA32CC /* micro.png in Resources */ = {isa = PBXBuildFile; fileRef = 34AB0AA614714D8700CA32CC /* micro.png */; };
+		34AB0AB214714D8700CA32CC /* pause_inactif.png in Resources */ = {isa = PBXBuildFile; fileRef = 34AB0AA714714D8700CA32CC /* pause_inactif.png */; };
+		34AB0AB314714D8700CA32CC /* pause.png in Resources */ = {isa = PBXBuildFile; fileRef = 34AB0AA814714D8700CA32CC /* pause.png */; };
 		34FD9BC0146ACC05004AB726 /* addcall-green.png in Resources */ = {isa = PBXBuildFile; fileRef = 34FD9BB7146ACC05004AB726 /* addcall-green.png */; };
 		34FD9BC1146ACC05004AB726 /* conf_merge.png in Resources */ = {isa = PBXBuildFile; fileRef = 34FD9BB8146ACC05004AB726 /* conf_merge.png */; };
 		34FD9BC2146ACC05004AB726 /* mic_active.png in Resources */ = {isa = PBXBuildFile; fileRef = 34FD9BB9146ACC05004AB726 /* mic_active.png */; };
@@ -414,6 +425,17 @@
 		346A75CE14628F02005C9D07 /* UIPauseResumeButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIPauseResumeButton.m; sourceTree = "<group>"; };
 		346A75D01462A786005C9D07 /* CallDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallDelegate.h; sourceTree = "<group>"; };
 		346A75D11462A786005C9D07 /* CallDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallDelegate.m; sourceTree = "<group>"; };
+		34AB0A9E14714D8700CA32CC /* ajouter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ajouter.png; path = Resources/ajouter.png; sourceTree = "<group>"; };
+		34AB0A9F14714D8700CA32CC /* clavier.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = clavier.png; path = Resources/clavier.png; sourceTree = "<group>"; };
+		34AB0AA014714D8700CA32CC /* contact.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact.png; path = Resources/contact.png; sourceTree = "<group>"; };
+		34AB0AA114714D8700CA32CC /* effacer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = effacer.png; path = Resources/effacer.png; sourceTree = "<group>"; };
+		34AB0AA214714D8700CA32CC /* grouper.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = grouper.png; path = Resources/grouper.png; sourceTree = "<group>"; };
+		34AB0AA314714D8700CA32CC /* HP_inverse.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HP_inverse.png; path = Resources/HP_inverse.png; sourceTree = "<group>"; };
+		34AB0AA414714D8700CA32CC /* HP.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HP.png; path = Resources/HP.png; sourceTree = "<group>"; };
+		34AB0AA514714D8700CA32CC /* micro_inverse.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = micro_inverse.png; path = Resources/micro_inverse.png; sourceTree = "<group>"; };
+		34AB0AA614714D8700CA32CC /* micro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = micro.png; path = Resources/micro.png; sourceTree = "<group>"; };
+		34AB0AA714714D8700CA32CC /* pause_inactif.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause_inactif.png; path = Resources/pause_inactif.png; sourceTree = "<group>"; };
+		34AB0AA814714D8700CA32CC /* pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause.png; path = Resources/pause.png; sourceTree = "<group>"; };
 		34FD9BB7146ACC05004AB726 /* addcall-green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "addcall-green.png"; path = "Resources/addcall-green.png"; sourceTree = "<group>"; };
 		34FD9BB8146ACC05004AB726 /* conf_merge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = conf_merge.png; path = Resources/conf_merge.png; sourceTree = "<group>"; };
 		34FD9BB9146ACC05004AB726 /* mic_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mic_active.png; path = Resources/mic_active.png; sourceTree = "<group>"; };
@@ -871,6 +893,17 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				34AB0A9E14714D8700CA32CC /* ajouter.png */,
+				34AB0A9F14714D8700CA32CC /* clavier.png */,
+				34AB0AA014714D8700CA32CC /* contact.png */,
+				34AB0AA114714D8700CA32CC /* effacer.png */,
+				34AB0AA214714D8700CA32CC /* grouper.png */,
+				34AB0AA314714D8700CA32CC /* HP_inverse.png */,
+				34AB0AA414714D8700CA32CC /* HP.png */,
+				34AB0AA514714D8700CA32CC /* micro_inverse.png */,
+				34AB0AA614714D8700CA32CC /* micro.png */,
+				34AB0AA714714D8700CA32CC /* pause_inactif.png */,
+				34AB0AA814714D8700CA32CC /* pause.png */,
 				34FD9BC9146ACD76004AB726 /* contact_orange.png */,
 				34FD9BB7146ACC05004AB726 /* addcall-green.png */,
 				34FD9BB8146ACC05004AB726 /* conf_merge.png */,
@@ -1032,6 +1065,17 @@
 				34FD9BC7146ACC05004AB726 /* Speaker-32-off.png in Resources */,
 				34FD9BC8146ACC05004AB726 /* Speaker-32-on.png in Resources */,
 				34FD9BCA146ACD76004AB726 /* contact_orange.png in Resources */,
+				34AB0AA914714D8700CA32CC /* ajouter.png in Resources */,
+				34AB0AAA14714D8700CA32CC /* clavier.png in Resources */,
+				34AB0AAB14714D8700CA32CC /* contact.png in Resources */,
+				34AB0AAC14714D8700CA32CC /* effacer.png in Resources */,
+				34AB0AAD14714D8700CA32CC /* grouper.png in Resources */,
+				34AB0AAE14714D8700CA32CC /* HP_inverse.png in Resources */,
+				34AB0AAF14714D8700CA32CC /* HP.png in Resources */,
+				34AB0AB014714D8700CA32CC /* micro_inverse.png in Resources */,
+				34AB0AB114714D8700CA32CC /* micro.png in Resources */,
+				34AB0AB214714D8700CA32CC /* pause_inactif.png in Resources */,
+				34AB0AB314714D8700CA32CC /* pause.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj
index ebd7dd53b..a23b9d634 100644
--- a/submodules/liblinphone.xcodeproj/project.pbxproj
+++ b/submodules/liblinphone.xcodeproj/project.pbxproj
@@ -156,7 +156,6 @@
 		222CA78511F6CFB100621220 /* sipsetup.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA76311F6CFB100621220 /* sipsetup.c */; };
 		222CA78611F6CFB100621220 /* sipsetup.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA76411F6CFB100621220 /* sipsetup.h */; };
 		2252935B12F6CA4700DD9BFB /* ec-calibrator.c in Sources */ = {isa = PBXBuildFile; fileRef = 2252935A12F6CA4700DD9BFB /* ec-calibrator.c */; };
-		225AA2DF144F0AA800BA809B /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 225AA2DE144F0AA800BA809B /* libSKP_SILK_SDK.a */; };
 		225AA2E1144F1C6600BA809B /* bitratedriver.c in Sources */ = {isa = PBXBuildFile; fileRef = 225AA2E0144F1C6600BA809B /* bitratedriver.c */; };
 		225AA2E3144F1E3400BA809B /* qosanalyzer.c in Sources */ = {isa = PBXBuildFile; fileRef = 225AA2E2144F1E3400BA809B /* qosanalyzer.c */; };
 		225AA2FD1451A95400BA809B /* conference.c in Sources */ = {isa = PBXBuildFile; fileRef = 225AA2FC1451A95400BA809B /* conference.c */; };
@@ -188,6 +187,7 @@
 		22FC56A813CB69FB002FD0F1 /* qualityindicator.c in Sources */ = {isa = PBXBuildFile; fileRef = 22FC56A713CB69FA002FD0F1 /* qualityindicator.c */; };
 		22FC56AA13CB6A4F002FD0F1 /* bitratecontrol.c in Sources */ = {isa = PBXBuildFile; fileRef = 22FC56A913CB6A4F002FD0F1 /* bitratecontrol.c */; };
 		3440A54B14697B570076355C /* l16.c in Sources */ = {isa = PBXBuildFile; fileRef = 3440A54A14697B570076355C /* l16.c */; };
+		34AB0AB814725C9900CA32CC /* ortp_srtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 34AB0AB714725C9900CA32CC /* ortp_srtp.c */; };
 		7014533C13FA7ECA00A01D86 /* zrtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 7014533B13FA7ECA00A01D86 /* zrtp.h */; };
 		7014533E13FA841E00A01D86 /* zrtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 7014533D13FA841E00A01D86 /* zrtp.c */; };
 		70E542EE13E147C7002BA2C0 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542ED13E147C7002BA2C0 /* OpenGLES.framework */; };
@@ -384,7 +384,6 @@
 		222CA76311F6CFB100621220 /* sipsetup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sipsetup.c; sourceTree = "<group>"; };
 		222CA76411F6CFB100621220 /* sipsetup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sipsetup.h; sourceTree = "<group>"; };
 		2252935A12F6CA4700DD9BFB /* ec-calibrator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ec-calibrator.c"; path = "linphone/coreapi/ec-calibrator.c"; sourceTree = SOURCE_ROOT; };
-		225AA2DE144F0AA800BA809B /* libSKP_SILK_SDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSKP_SILK_SDK.a; path = "../liblinphone-sdk/apple-darwin/lib/libSKP_SILK_SDK.a"; sourceTree = "<group>"; };
 		225AA2E0144F1C6600BA809B /* bitratedriver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitratedriver.c; sourceTree = "<group>"; };
 		225AA2E2144F1E3400BA809B /* qosanalyzer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qosanalyzer.c; sourceTree = "<group>"; };
 		225AA2FC1451A95400BA809B /* conference.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = conference.c; sourceTree = "<group>"; };
@@ -420,6 +419,7 @@
 		22FC56A713CB69FA002FD0F1 /* qualityindicator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qualityindicator.c; sourceTree = "<group>"; };
 		22FC56A913CB6A4F002FD0F1 /* bitratecontrol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitratecontrol.c; sourceTree = "<group>"; };
 		3440A54A14697B570076355C /* l16.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = l16.c; sourceTree = "<group>"; };
+		34AB0AB714725C9900CA32CC /* ortp_srtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ortp_srtp.c; sourceTree = "<group>"; };
 		7014533B13FA7ECA00A01D86 /* zrtp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zrtp.h; sourceTree = "<group>"; };
 		7014533D13FA841E00A01D86 /* zrtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zrtp.c; sourceTree = "<group>"; };
 		70E542ED13E147C7002BA2C0 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
@@ -434,7 +434,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				225AA2DF144F0AA800BA809B /* libSKP_SILK_SDK.a in Frameworks */,
 				70E542F113E147CE002BA2C0 /* QuartzCore.framework in Frameworks */,
 				70E542EE13E147C7002BA2C0 /* OpenGLES.framework in Frameworks */,
 				221F58A013AB50F800D603C9 /* CoreMedia.framework in Frameworks */,
@@ -475,7 +474,6 @@
 		0867D691FE84028FC02AAC07 /* liblinphone */ = {
 			isa = PBXGroup;
 			children = (
-				225AA2DE144F0AA800BA809B /* libSKP_SILK_SDK.a */,
 				70E542F013E147CE002BA2C0 /* QuartzCore.framework */,
 				70E542ED13E147C7002BA2C0 /* OpenGLES.framework */,
 				221F589F13AB50F800D603C9 /* CoreMedia.framework */,
@@ -701,6 +699,7 @@
 		222CA6B611F6CF9F00621220 /* src */ = {
 			isa = PBXGroup;
 			children = (
+				34AB0AB714725C9900CA32CC /* ortp_srtp.c */,
 				7014533D13FA841E00A01D86 /* zrtp.c */,
 				222CA6B711F6CF9F00621220 /* .gitignore */,
 				222CA6B811F6CF9F00621220 /* avprofile.c */,
@@ -1121,6 +1120,7 @@
 				225AA2FD1451A95400BA809B /* conference.c in Sources */,
 				22985D9314643BEF005CA0B5 /* aqsnd.c in Sources */,
 				3440A54B14697B570076355C /* l16.c in Sources */,
+				34AB0AB814725C9900CA32CC /* ortp_srtp.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1199,6 +1199,7 @@
 					TARGET_OS_IPHONE,
 				);
 				GCC_UNROLL_LOOPS = NO;
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				HEADER_SEARCH_PATHS = (
 					linphone/mediastreamer2/build/iphone,
 					linphone/mediastreamer2/include,
@@ -1251,6 +1252,7 @@
 					TARGET_OS_IPHONE,
 				);
 				GCC_UNROLL_LOOPS = NO;
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				HEADER_SEARCH_PATHS = (
 					linphone/mediastreamer2/build/iphone,
 					linphone/mediastreamer2/include,
@@ -1429,6 +1431,7 @@
 					TARGET_OS_IPHONE,
 				);
 				GCC_UNROLL_LOOPS = NO;
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				HEADER_SEARCH_PATHS = (
 					linphone/mediastreamer2/build/iphone,
 					linphone/mediastreamer2/include,