diff --git a/Classes/ContactDetailsLabelViewController.m b/Classes/ContactDetailsLabelViewController.m
index ad5e22e21..62508669a 100644
--- a/Classes/ContactDetailsLabelViewController.m
+++ b/Classes/ContactDetailsLabelViewController.m
@@ -68,6 +68,8 @@
     UITableViewCell *cell = [atableView dequeueReusableCellWithIdentifier:kCellId];
     if (cell == nil) {  
         cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:kCellId] autorelease];
+        //TODO
+        /*[cell setSelectedBackgroundView:[[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"list_highlight.png"]]autorelease]];*/
     }
     NSString* key = [[dataList allKeys] objectAtIndex:[indexPath row]];
     [cell.textLabel setText:[dataList objectForKey:key]];
diff --git a/Classes/ContactsTableViewController.m b/Classes/ContactsTableViewController.m
index f3d930e47..258d265b1 100644
--- a/Classes/ContactsTableViewController.m
+++ b/Classes/ContactsTableViewController.m
@@ -189,7 +189,7 @@ static void sync_toc_address_book (ABAddressBookRef addressBook, CFDictionaryRef
             cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:kNewContactCellId] autorelease];
             //TODO
             /*
-            [cell setSelectedBackgroundView:[[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"list_hightlight.png"]]autorelease]];*/
+            [cell setSelectedBackgroundView:[[[UIImageView alloc] initWithImage:[UIImage imageNamed:@"list_highlight.png"]]autorelease]];*/
         }
         [cell.textLabel setText:@"Add new contact"];
         return cell;
diff --git a/Classes/LinphoneUI/UICallCell.h b/Classes/LinphoneUI/UICallCell.h
index 00e624083..e48b2de57 100644
--- a/Classes/LinphoneUI/UICallCell.h
+++ b/Classes/LinphoneUI/UICallCell.h
@@ -39,7 +39,7 @@
     BOOL currentCall;
     
     UIImageView* headerBackgroundImage;
-    UIImageView* headerBackgroundHightlightImage;
+    UIImageView* headerBackgroundHighlightImage;
     
     UILabel *addressLabel;
     UILabel *stateLabel;
@@ -57,7 +57,7 @@
 @property (retain) UICallCellData *data;
 
 @property (nonatomic, retain) IBOutlet UIImageView* headerBackgroundImage;
-@property (nonatomic, retain) IBOutlet UIImageView* headerBackgroundHightlightImage;
+@property (nonatomic, retain) IBOutlet UIImageView* headerBackgroundHighlightImage;
 
 @property (nonatomic, retain) IBOutlet UILabel* addressLabel;
 @property (nonatomic, retain) IBOutlet UILabel* stateLabel;
diff --git a/Classes/LinphoneUI/UICallCell.m b/Classes/LinphoneUI/UICallCell.m
index 083b7ba3a..6bb07e7b4 100644
--- a/Classes/LinphoneUI/UICallCell.m
+++ b/Classes/LinphoneUI/UICallCell.m
@@ -40,7 +40,7 @@
 @synthesize data;
 
 @synthesize headerBackgroundImage;
-@synthesize headerBackgroundHightlightImage;
+@synthesize headerBackgroundHighlightImage;
 
 @synthesize addressLabel;
 @synthesize stateLabel;
@@ -90,7 +90,7 @@
 - (void)prepareForReuse {
     [super prepareForReuse];
     self->currentCall = FALSE;
-    [headerBackgroundHightlightImage setAlpha:0.0f];
+    [headerBackgroundHighlightImage setAlpha:0.0f];
 }
 
 #pragma mark - Properties Functions
@@ -100,9 +100,9 @@
     currentCall = val;
     if(oldVal != val) {
         if (currentCall) {
-            [self startBlinkAnimation:@"Blink" target:headerBackgroundHightlightImage];
+            [self startBlinkAnimation:@"Blink" target:headerBackgroundHighlightImage];
         } else {
-            [self stopBlinkAnimation:@"Blink" target:headerBackgroundHightlightImage];
+            [self stopBlinkAnimation:@"Blink" target:headerBackgroundHighlightImage];
         }
     }
 }
@@ -193,10 +193,10 @@
             [removeButton setHidden:true];
             if(firstCell) {
                 [headerBackgroundImage setImage:[UIImage imageNamed:@"cell_call_first.png"]];
-                [headerBackgroundHightlightImage setImage:[UIImage imageNamed:@"cell_call_first_hightlight.png"]];
+                [headerBackgroundHighlightImage setImage:[UIImage imageNamed:@"cell_call_first_highlight.png"]];
             } else {
                 [headerBackgroundImage setImage:[UIImage imageNamed:@"cell_call.png"]];
-                [headerBackgroundHightlightImage setImage:[UIImage imageNamed:@"cell_call_hightlight.png"]];
+                [headerBackgroundHighlightImage setImage:[UIImage imageNamed:@"cell_call_highlight.png"]];
             }
         } else {
             [stateImage setHidden:true];
diff --git a/Classes/LinphoneUI/UICallCell.xib b/Classes/LinphoneUI/UICallCell.xib
index b6da4700f..c3a0437e7 100644
--- a/Classes/LinphoneUI/UICallCell.xib
+++ b/Classes/LinphoneUI/UICallCell.xib
@@ -4806,14 +4806,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 					</object>
 					<int key="connectionID">54</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">headerBackgroundHightlightImage</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="174867822"/>
-					</object>
-					<int key="connectionID">57</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">selectedBackgroundView</string>
@@ -4822,6 +4814,14 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 					</object>
 					<int key="connectionID">58</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">headerBackgroundHighlightImage</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="174867822"/>
+					</object>
+					<int key="connectionID">59</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">doHeaderClick:</string>
@@ -4965,7 +4965,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 						<int key="objectID">56</int>
 						<reference key="object" ref="174867822"/>
 						<reference key="parent" ref="227927177"/>
-						<string key="objectName">headerBackgroundHightlightImage</string>
+						<string key="objectName">headerBackgroundHighlightImage</string>
 					</object>
 				</array>
 			</object>
@@ -4999,7 +4999,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">58</int>
+			<int key="maxID">59</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -5024,7 +5024,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 						<string key="addressLabel">UILabel</string>
 						<string key="avatarImage">UIImageView</string>
 						<string key="avatarView">UIView</string>
-						<string key="headerBackgroundHightlightImage">UIImageView</string>
+						<string key="headerBackgroundHighlightImage">UIImageView</string>
 						<string key="headerBackgroundImage">UIImageView</string>
 						<string key="headerView">UIView</string>
 						<string key="pauseButton">UIPauseButton</string>
@@ -5045,8 +5045,8 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 							<string key="name">avatarView</string>
 							<string key="candidateClassName">UIView</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="headerBackgroundHightlightImage">
-							<string key="name">headerBackgroundHightlightImage</string>
+						<object class="IBToOneOutletInfo" key="headerBackgroundHighlightImage">
+							<string key="name">headerBackgroundHighlightImage</string>
 							<string key="candidateClassName">UIImageView</string>
 						</object>
 						<object class="IBToOneOutletInfo" key="headerBackgroundImage">
diff --git a/Classes/LinphoneUI/UIChatCell.xib b/Classes/LinphoneUI/UIChatCell.xib
index 9d6d04987..dda98e6a6 100644
--- a/Classes/LinphoneUI/UIChatCell.xib
+++ b/Classes/LinphoneUI/UIChatCell.xib
@@ -42,7 +42,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{10, 8}, {27, 27}}</string>
 						<reference key="NSSuperview" ref="316763236"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="394118737"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -57,7 +56,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{45, 0}, {60, 44}}</string>
 						<reference key="NSSuperview" ref="316763236"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="641729677"/>
 						<string key="NSReuseIdentifierKey">_NS:328</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -93,7 +91,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{110, 0}, {170, 44}}</string>
 						<reference key="NSSuperview" ref="316763236"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="162769001"/>
 						<string key="NSReuseIdentifierKey">_NS:328</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -126,7 +123,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{276, 0}, {44, 44}}</string>
 						<reference key="NSSuperview" ref="316763236"/>
-						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="753878244"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -164,7 +161,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{276, 0}, {44, 44}}</string>
 						<reference key="NSSuperview" ref="316763236"/>
-						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -190,7 +187,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 44}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="567463562"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor" id="867293857">
@@ -204,13 +200,13 @@
 				<int key="NSvFlags">292</int>
 				<string key="NSFrameSize">{320, 44}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<bool key="IBUIUserInteractionEnabled">NO</bool>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<object class="NSCustomResource" key="IBUIImage">
 					<string key="NSClassName">NSImage</string>
-					<string key="NSResourceName">list_hightlight.png</string>
+					<string key="NSResourceName">list_highlight.png</string>
 				</object>
 			</object>
 			<object class="IBUIImageView" id="1023335036">
@@ -218,7 +214,7 @@
 				<int key="NSvFlags">292</int>
 				<string key="NSFrameSize">{320, 44}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="867293857"/>
 				<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -401,61 +397,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">37</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">UIChatCell</string>
-					<string key="superclassName">UITableViewCell</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onDeleteClick:">id</string>
-						<string key="onDetailsClick:">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="onDetailsClick:">
-							<string key="name">onDetailsClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="avatarImage">UIImageView</string>
-						<string key="chatContentLabel">UILabel</string>
-						<string key="deleteButton">UIButton</string>
-						<string key="detailsButton">UIButton</string>
-						<string key="displayNameLabel">UILabel</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="avatarImage">
-							<string key="name">avatarImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="chatContentLabel">
-							<string key="name">chatContentLabel</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="detailsButton">
-							<string key="name">detailsButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="displayNameLabel">
-							<string key="name">displayNameLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIChatCell.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">
@@ -470,7 +412,7 @@
 			<string key="list_delete_over.png">{45, 45}</string>
 			<string key="list_details_default.png">{45, 45}</string>
 			<string key="list_details_over.png">{45, 45}</string>
-			<string key="list_hightlight.png">{640, 88}</string>
+			<string key="list_highlight.png">{640, 88}</string>
 		</dictionary>
 		<string key="IBCocoaTouchPluginVersion">1181</string>
 	</data>
diff --git a/Classes/LinphoneUI/UIContactCell.xib b/Classes/LinphoneUI/UIContactCell.xib
index bfa83f78e..0b696c528 100644
--- a/Classes/LinphoneUI/UIContactCell.xib
+++ b/Classes/LinphoneUI/UIContactCell.xib
@@ -41,7 +41,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{6, 6}, {32, 32}}</string>
 						<reference key="NSSuperview" ref="675878782"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="505648338"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -52,7 +51,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{46, 0}, {55, 44}}</string>
 						<reference key="NSSuperview" ref="675878782"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="261477247"/>
 						<string key="NSReuseIdentifierKey">_NS:328</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -88,7 +86,7 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{111, 0}, {200, 44}}</string>
 						<reference key="NSSuperview" ref="675878782"/>
-						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:328</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -118,7 +116,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 44}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="275930832"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor" id="318755954">
@@ -132,13 +129,13 @@
 				<int key="NSvFlags">292</int>
 				<string key="NSFrameSize">{320, 44}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<bool key="IBUIUserInteractionEnabled">NO</bool>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<object class="NSCustomResource" key="IBUIImage">
 					<string key="NSClassName">NSImage</string>
-					<string key="NSResourceName">list_hightlight.png</string>
+					<string key="NSResourceName">list_highlight.png</string>
 				</object>
 			</object>
 			<object class="IBUIImageView" id="278307539">
@@ -146,7 +143,7 @@
 				<int key="NSvFlags">292</int>
 				<string key="NSFrameSize">{320, 44}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="318755954"/>
 				<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -275,37 +272,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">24</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">UIContactCell</string>
-					<string key="superclassName">UITableViewCell</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="avatarImage">UIImageView</string>
-						<string key="firstNameLabel">UILabel</string>
-						<string key="lastNameLabel">UILabel</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="avatarImage">
-							<string key="name">avatarImage</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="firstNameLabel">
-							<string key="name">firstNameLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="lastNameLabel">
-							<string key="name">lastNameLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIContactCell.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">
@@ -315,7 +282,7 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NS.key.0">list_hightlight.png</string>
+			<string key="NS.key.0">list_highlight.png</string>
 			<string key="NS.object.0">{640, 88}</string>
 		</object>
 		<string key="IBCocoaTouchPluginVersion">1181</string>
diff --git a/Classes/LinphoneUI/UIHistoryCell.xib b/Classes/LinphoneUI/UIHistoryCell.xib
index d921b21d4..4a1efe211 100644
--- a/Classes/LinphoneUI/UIHistoryCell.xib
+++ b/Classes/LinphoneUI/UIHistoryCell.xib
@@ -129,6 +129,7 @@
 						<string key="NSFrame">{{276, 0}, {44, 44}}</string>
 						<reference key="NSSuperview" ref="702431052"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -169,12 +170,13 @@
 				<string key="NSFrameSize">{320, 44}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<bool key="IBUIUserInteractionEnabled">NO</bool>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<object class="NSCustomResource" key="IBUIImage">
 					<string key="NSClassName">NSImage</string>
-					<string key="NSResourceName">list_hightlight.png</string>
+					<string key="NSResourceName">list_highlight.png</string>
 				</object>
 			</object>
 			<object class="IBUIImageView" id="183666818">
@@ -183,6 +185,7 @@
 				<string key="NSFrameSize">{320, 44}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="682184802"/>
 				<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -412,7 +415,7 @@
 			<string key="list_delete_over.png">{45, 45}</string>
 			<string key="list_details_default.png">{45, 45}</string>
 			<string key="list_details_over.png">{45, 45}</string>
-			<string key="list_hightlight.png">{640, 88}</string>
+			<string key="list_highlight.png">{640, 88}</string>
 		</dictionary>
 		<string key="IBCocoaTouchPluginVersion">1181</string>
 	</data>
diff --git a/Resources/cell_call_first_hightlight.png b/Resources/cell_call_first_highlight.png
similarity index 100%
rename from Resources/cell_call_first_hightlight.png
rename to Resources/cell_call_first_highlight.png
diff --git a/Resources/cell_call_hightlight.png b/Resources/cell_call_highlight.png
similarity index 100%
rename from Resources/cell_call_hightlight.png
rename to Resources/cell_call_highlight.png
diff --git a/Resources/list_hightlight.png b/Resources/list_highlight.png
similarity index 100%
rename from Resources/list_hightlight.png
rename to Resources/list_highlight.png
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index fe16b075c..24123f5f1 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -177,8 +177,8 @@
 		D3128FF415AABE4E00A2147A /* contact_edit_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3128FE915AABE4E00A2147A /* contact_edit_default.png */; };
 		D3128FF515AABE4E00A2147A /* contact_edit_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3128FEA15AABE4E00A2147A /* contact_edit_over.png */; };
 		D3128FF615AABE4E00A2147A /* contact_edit_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3128FEA15AABE4E00A2147A /* contact_edit_over.png */; };
-		D3196D2D15A3199D007FEEBA /* list_hightlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D3196D2C15A3199D007FEEBA /* list_hightlight.png */; };
-		D3196D2E15A3199D007FEEBA /* list_hightlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D3196D2C15A3199D007FEEBA /* list_hightlight.png */; };
+		D3196D2D15A3199D007FEEBA /* list_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D3196D2C15A3199D007FEEBA /* list_highlight.png */; };
+		D3196D2E15A3199D007FEEBA /* list_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D3196D2C15A3199D007FEEBA /* list_highlight.png */; };
 		D3196D3415A321E3007FEEBA /* options_add_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3196D3015A321E2007FEEBA /* options_add_default.png */; };
 		D3196D3515A321E3007FEEBA /* options_add_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3196D3015A321E2007FEEBA /* options_add_default.png */; };
 		D3196D3615A321E3007FEEBA /* options_add_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3196D3115A321E2007FEEBA /* options_add_over.png */; };
@@ -475,10 +475,10 @@
 		D389363A15A6D53200A3A3AA /* chat_bubble_incoming.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D389363715A6D53200A3A3AA /* chat_bubble_incoming.9.png */; };
 		D389363B15A6D53200A3A3AA /* chat_bubble_outgoing.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D389363815A6D53200A3A3AA /* chat_bubble_outgoing.9.png */; };
 		D389363C15A6D53200A3A3AA /* chat_bubble_outgoing.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D389363815A6D53200A3A3AA /* chat_bubble_outgoing.9.png */; };
-		D38D14AF15A30B3D008497E8 /* cell_call_first_hightlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D38D14AD15A30B3D008497E8 /* cell_call_first_hightlight.png */; };
-		D38D14B015A30B3D008497E8 /* cell_call_first_hightlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D38D14AD15A30B3D008497E8 /* cell_call_first_hightlight.png */; };
-		D38D14B115A30B3D008497E8 /* cell_call_hightlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D38D14AE15A30B3D008497E8 /* cell_call_hightlight.png */; };
-		D38D14B215A30B3D008497E8 /* cell_call_hightlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D38D14AE15A30B3D008497E8 /* cell_call_hightlight.png */; };
+		D38D14AF15A30B3D008497E8 /* cell_call_first_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D38D14AD15A30B3D008497E8 /* cell_call_first_highlight.png */; };
+		D38D14B015A30B3D008497E8 /* cell_call_first_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D38D14AD15A30B3D008497E8 /* cell_call_first_highlight.png */; };
+		D38D14B115A30B3D008497E8 /* cell_call_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D38D14AE15A30B3D008497E8 /* cell_call_highlight.png */; };
+		D38D14B215A30B3D008497E8 /* cell_call_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D38D14AE15A30B3D008497E8 /* cell_call_highlight.png */; };
 		D3A55FBC15877E5E003FD403 /* UIContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* UIContactCell.m */; };
 		D3A55FBD15877E5E003FD403 /* UIContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* UIContactCell.m */; };
 		D3A55FBF15877E69003FD403 /* UIContactCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3A55FBE15877E69003FD403 /* UIContactCell.xib */; };
@@ -1066,7 +1066,7 @@
 		D3128FE815AABE4E00A2147A /* contact_back_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact_back_over.png; path = Resources/contact_back_over.png; sourceTree = "<group>"; };
 		D3128FE915AABE4E00A2147A /* contact_edit_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact_edit_default.png; path = Resources/contact_edit_default.png; sourceTree = "<group>"; };
 		D3128FEA15AABE4E00A2147A /* contact_edit_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact_edit_over.png; path = Resources/contact_edit_over.png; sourceTree = "<group>"; };
-		D3196D2C15A3199D007FEEBA /* list_hightlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = list_hightlight.png; path = Resources/list_hightlight.png; sourceTree = "<group>"; };
+		D3196D2C15A3199D007FEEBA /* list_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = list_highlight.png; path = Resources/list_highlight.png; sourceTree = "<group>"; };
 		D3196D3015A321E2007FEEBA /* options_add_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = options_add_default.png; path = Resources/options_add_default.png; sourceTree = "<group>"; };
 		D3196D3115A321E2007FEEBA /* options_add_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = options_add_over.png; path = Resources/options_add_over.png; sourceTree = "<group>"; };
 		D3196D3215A321E3007FEEBA /* options_transfer_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = options_transfer_default.png; path = Resources/options_transfer_default.png; sourceTree = "<group>"; };
@@ -1269,8 +1269,8 @@
 		D389362A15A6D3C500A3A3AA /* NinePatch.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = NinePatch.xcodeproj; path = NinePatch/NinePatch.xcodeproj; sourceTree = "<group>"; };
 		D389363715A6D53200A3A3AA /* chat_bubble_incoming.9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_bubble_incoming.9.png; path = Resources/chat_bubble_incoming.9.png; sourceTree = "<group>"; };
 		D389363815A6D53200A3A3AA /* chat_bubble_outgoing.9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_bubble_outgoing.9.png; path = Resources/chat_bubble_outgoing.9.png; sourceTree = "<group>"; };
-		D38D14AD15A30B3D008497E8 /* cell_call_first_hightlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cell_call_first_hightlight.png; path = Resources/cell_call_first_hightlight.png; sourceTree = "<group>"; };
-		D38D14AE15A30B3D008497E8 /* cell_call_hightlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cell_call_hightlight.png; path = Resources/cell_call_hightlight.png; sourceTree = "<group>"; };
+		D38D14AD15A30B3D008497E8 /* cell_call_first_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cell_call_first_highlight.png; path = Resources/cell_call_first_highlight.png; sourceTree = "<group>"; };
+		D38D14AE15A30B3D008497E8 /* cell_call_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cell_call_highlight.png; path = Resources/cell_call_highlight.png; sourceTree = "<group>"; };
 		D3A55FBA15877E5E003FD403 /* UIContactCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIContactCell.h; sourceTree = "<group>"; };
 		D3A55FBB15877E5E003FD403 /* UIContactCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIContactCell.m; sourceTree = "<group>"; };
 		D3A55FBE15877E69003FD403 /* UIContactCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UIContactCell.xib; sourceTree = "<group>"; };
@@ -2084,8 +2084,8 @@
 				D31C9C8F158A1C1000756B45 /* call_status_outgoing.png */,
 				D36C43CC158F2F370048BA40 /* cell_call.png */,
 				D3211BB8159C8A820098460B /* cell_call_first.png */,
-				D38D14AD15A30B3D008497E8 /* cell_call_first_hightlight.png */,
-				D38D14AE15A30B3D008497E8 /* cell_call_hightlight.png */,
+				D38D14AD15A30B3D008497E8 /* cell_call_first_highlight.png */,
+				D38D14AE15A30B3D008497E8 /* cell_call_highlight.png */,
 				D36C43CD158F2F370048BA40 /* cell_conference.png */,
 				D3EA5401159852080037DC6B /* chat_add_default.png */,
 				D3EA5402159852080037DC6B /* chat_add_over.png */,
@@ -2164,7 +2164,7 @@
 				D3EA5417159858A80037DC6B /* list_delete_over.png */,
 				D354981815876FE7000081D8 /* list_details_default.png */,
 				D354981915876FE7000081D8 /* list_details_over.png */,
-				D3196D2C15A3199D007FEEBA /* list_hightlight.png */,
+				D3196D2C15A3199D007FEEBA /* list_highlight.png */,
 				D3F83EF4158205A100336684 /* micro_off_default.png */,
 				D35EA76115A2DF8D003E025D /* micro_off_disabled.png */,
 				D3F83EF5158205A100336684 /* micro_off_over.png */,
@@ -2672,9 +2672,9 @@
 				D365AA7D15A2DE7500CAFE3F /* speaker_on_disabled.png in Resources */,
 				D35EA76315A2DF8D003E025D /* micro_off_disabled.png in Resources */,
 				D35EA76515A2DF8D003E025D /* micro_on_disabled.png in Resources */,
-				D38D14AF15A30B3D008497E8 /* cell_call_first_hightlight.png in Resources */,
-				D38D14B115A30B3D008497E8 /* cell_call_hightlight.png in Resources */,
-				D3196D2D15A3199D007FEEBA /* list_hightlight.png in Resources */,
+				D38D14AF15A30B3D008497E8 /* cell_call_first_highlight.png in Resources */,
+				D38D14B115A30B3D008497E8 /* cell_call_highlight.png in Resources */,
+				D3196D2D15A3199D007FEEBA /* list_highlight.png in Resources */,
 				D3196D3415A321E3007FEEBA /* options_add_default.png in Resources */,
 				D3196D3615A321E3007FEEBA /* options_add_over.png in Resources */,
 				D3196D3815A321E3007FEEBA /* options_transfer_default.png in Resources */,
@@ -2911,9 +2911,9 @@
 				D365AA7E15A2DE7500CAFE3F /* speaker_on_disabled.png in Resources */,
 				D35EA76415A2DF8D003E025D /* micro_off_disabled.png in Resources */,
 				D35EA76615A2DF8D003E025D /* micro_on_disabled.png in Resources */,
-				D38D14B015A30B3D008497E8 /* cell_call_first_hightlight.png in Resources */,
-				D38D14B215A30B3D008497E8 /* cell_call_hightlight.png in Resources */,
-				D3196D2E15A3199D007FEEBA /* list_hightlight.png in Resources */,
+				D38D14B015A30B3D008497E8 /* cell_call_first_highlight.png in Resources */,
+				D38D14B215A30B3D008497E8 /* cell_call_highlight.png in Resources */,
+				D3196D2E15A3199D007FEEBA /* list_highlight.png in Resources */,
 				D3196D3515A321E3007FEEBA /* options_add_default.png in Resources */,
 				D3196D3715A321E3007FEEBA /* options_add_over.png in Resources */,
 				D3196D3915A321E3007FEEBA /* options_transfer_default.png in Resources */,