diff --git a/Classes/ContactsViewController.m b/Classes/ContactsViewController.m
index e3f3df8a6..c5fa9e9b7 100644
--- a/Classes/ContactsViewController.m
+++ b/Classes/ContactsViewController.m
@@ -41,6 +41,15 @@ typedef enum _HistoryView {
     return [super initWithNibName:@"ContactsViewController" bundle:[NSBundle mainBundle]];
 }
 
+- (void)dealloc {
+    [tableController release];
+    [tableView release];
+    
+    [allButton release];
+    [linphoneButton release];
+    
+    [super dealloc];
+}
 
 #pragma mark - ViewController Functions
 
@@ -53,6 +62,14 @@ typedef enum _HistoryView {
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self changeView: History_All];
+    
+    // Set selected+over background: IB lack !
+    [linphoneButton setImage:[UIImage imageNamed:@"contacts_linphone_selected.png"] 
+                 forState:(UIControlStateHighlighted | UIControlStateSelected)];
+    
+    // Set selected+over background: IB lack !
+    [allButton setImage:[UIImage imageNamed:@"contacts_all_selected.png"] 
+                    forState:(UIControlStateHighlighted | UIControlStateSelected)];
 }
 
 
diff --git a/Classes/ContactsViewController.xib b/Classes/ContactsViewController.xib
index 6b6098c90..abc6f1e2e 100644
--- a/Classes/ContactsViewController.xib
+++ b/Classes/ContactsViewController.xib
@@ -46,7 +46,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{106, 58}</string>
 								<reference key="NSSuperview" ref="95706395"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="596330568"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -61,10 +60,11 @@
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MC41AA</bytes>
 								</object>
-								<object class="NSCustomResource" key="IBUISelectedImage">
+								<object class="NSCustomResource" key="IBUIHighlightedImage" id="671589300">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">contacts_all_selected.png</string>
 								</object>
+								<reference key="IBUISelectedImage" ref="671589300"/>
 								<object class="NSCustomResource" key="IBUINormalImage">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">contacts_all_default.png</string>
@@ -84,7 +84,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{106, 0}, {106, 58}}</string>
 								<reference key="NSSuperview" ref="95706395"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="600417980"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -96,10 +95,11 @@
 								<int key="IBUIContentVerticalAlignment">0</int>
 								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
 								<reference key="IBUINormalTitleShadowColor" ref="873246362"/>
-								<object class="NSCustomResource" key="IBUISelectedImage">
+								<object class="NSCustomResource" key="IBUIHighlightedImage" id="930661919">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">contacts_linphone_selected.png</string>
 								</object>
+								<reference key="IBUISelectedImage" ref="930661919"/>
 								<object class="NSCustomResource" key="IBUINormalImage">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">contacts_linphone_default.png</string>
@@ -112,7 +112,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{212, 0}, {108, 58}}</string>
 								<reference key="NSSuperview" ref="95706395"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="562388802"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -138,7 +137,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 58}</string>
 						<reference key="NSSuperview" ref="812520855"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="257572356"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -155,7 +153,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{0, 58}, {320, 402}}</string>
 						<reference key="NSSuperview" ref="812520855"/>
-						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:10</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
@@ -182,7 +179,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="95706395"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -370,7 +366,7 @@
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="1" key="4.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="0.0" key="5.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<real value="1" key="5.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="1" key="6.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="69.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -383,64 +379,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">84</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ContactsTableViewController</string>
-					<string key="superclassName">UITableViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ContactsTableViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">ContactsViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onAllClick:">id</string>
-						<string key="onLinphoneClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onAllClick:">
-							<string key="name">onAllClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onLinphoneClick:">
-							<string key="name">onLinphoneClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="allButton">UIButton</string>
-						<string key="linphoneButton">UIButton</string>
-						<string key="tableController">ContactsTableViewController</string>
-						<string key="tableView">UITableView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="allButton">
-							<string key="name">allButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="linphoneButton">
-							<string key="name">linphoneButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableController">
-							<string key="name">tableController</string>
-							<string key="candidateClassName">ContactsTableViewController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableView">
-							<string key="name">tableView</string>
-							<string key="candidateClassName">UITableView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ContactsViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
diff --git a/Classes/HistoryViewController.m b/Classes/HistoryViewController.m
index 3d49390fa..766282145 100644
--- a/Classes/HistoryViewController.m
+++ b/Classes/HistoryViewController.m
@@ -42,9 +42,13 @@ typedef enum _HistoryView {
 }
 
 - (void)dealloc {
+    [tableController release];
+    [tableView release];
+    
     [allButton release];
     [missedButton release];
     [editButton release];
+    
     [super dealloc];
 }
 
@@ -69,6 +73,14 @@ typedef enum _HistoryView {
     // Set selected+over background: IB lack !
     [editButton setImage:[UIImage imageNamed:@"history_ok_over.png"] 
                           forState:(UIControlStateHighlighted | UIControlStateSelected)];
+    
+    // Set selected+over background: IB lack !
+    [allButton setImage:[UIImage imageNamed:@"history_all_selected.png"] 
+                    forState:(UIControlStateHighlighted | UIControlStateSelected)];
+    
+    // Set selected+over background: IB lack !
+    [missedButton setImage:[UIImage imageNamed:@"history_missed_selected.png"] 
+               forState:(UIControlStateHighlighted | UIControlStateSelected)];
 }
 
 
diff --git a/Classes/HistoryViewController.xib b/Classes/HistoryViewController.xib
index 446e0a4ac..76bab3437 100644
--- a/Classes/HistoryViewController.xib
+++ b/Classes/HistoryViewController.xib
@@ -61,10 +61,11 @@
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MC41AA</bytes>
 								</object>
-								<object class="NSCustomResource" key="IBUISelectedImage">
+								<object class="NSCustomResource" key="IBUIHighlightedImage" id="739681638">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">history_all_selected.png</string>
 								</object>
+								<reference key="IBUISelectedImage" ref="739681638"/>
 								<object class="NSCustomResource" key="IBUINormalImage">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">history_all_default.png</string>
@@ -96,10 +97,11 @@
 								<int key="IBUIContentVerticalAlignment">0</int>
 								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
 								<reference key="IBUINormalTitleShadowColor" ref="873246362"/>
-								<object class="NSCustomResource" key="IBUISelectedImage">
+								<object class="NSCustomResource" key="IBUIHighlightedImage" id="172130534">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">history_missed_selected.png</string>
 								</object>
+								<reference key="IBUISelectedImage" ref="172130534"/>
 								<object class="NSCustomResource" key="IBUINormalImage">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">history_missed_default.png</string>
@@ -160,6 +162,7 @@
 						<string key="NSFrame">{{0, 58}, {320, 402}}</string>
 						<reference key="NSSuperview" ref="812520855"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
@@ -390,7 +393,7 @@
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="2" key="4.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="0.0" key="5.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<real value="1" key="5.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="6.CustomClassName">UIToggleButton</string>
 				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="2" key="6.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>