diff --git a/res/layout/about.xml b/res/layout/about.xml
index 2b51dfc5c..8ef477f60 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -5,34 +5,39 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/top_bar"
+        android:orientation="horizontal"
         android:background="@color/colorF"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:visibility="visible"
-        android:layout_alignParentTop="true">
+        android:layout_height="60dp">
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.2"/>
 
         <TextView
             android:id="@+id/menu_name"
             android:text="@string/about"
             style="@style/font1"
-            android:layout_width="wrap_content"
+            android:singleLine="true"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_centerInParent="true"
-            android:gravity="center_vertical"/>
+            android:layout_weight="0.4"
+            android:gravity="center"
+            android:padding="15dp"/>
 
         <ImageView
             android:id="@+id/cancel"
             android:src="@drawable/dialer_back"
             android:background="@drawable/toolbar_button"
-            android:layout_width="60dp"
+            android:contentDescription="@string/content_description_edit"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:padding="12dp"
-            android:layout_centerInParent="true"
-            android:layout_alignParentRight="true"/>
-
-    </RelativeLayout>
+            android:layout_weight="0.2"
+            android:padding="15dp"/>
+    </LinearLayout>
 
     <ImageView
         android:src="@drawable/linphone_logo_orange"
diff --git a/res/layout/call.xml b/res/layout/call.xml
index 45ed5e618..cd0de6e2c 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -9,7 +9,7 @@
 		android:id="@+id/status"
 		android:name="org.linphone.StatusFragment"
 		android:layout_width="match_parent"
-		android:layout_height="35dp"
+		android:layout_height="40dp"
 		tools:layout="@layout/status" />
 
 
diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index 2396a3c80..3ccd2829b 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -4,8 +4,9 @@
     android:layout_height="match_parent"
   	android:background="@color/colorH" >
 
-	<RelativeLayout
+	<LinearLayout
 		android:id="@+id/top_bar"
+		android:orientation="horizontal"
 		android:background="@color/colorF"
 		android:layout_width="match_parent"
 		android:layout_height="60dp">
@@ -14,19 +15,20 @@
 			android:id="@+id/back"
 			android:src="@drawable/back"
 			android:background="@drawable/toolbar_button"
-			android:layout_width="60dp"
+			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:layout_alignParentLeft="true"
-			android:padding="20dp"/>
+			android:layout_weight="0.2"
+			android:padding="18dp"/>
 
-		<ImageView
-			android:id="@+id/edit"
-			android:src="@drawable/edit_list_button"
-			android:background="@drawable/toolbar_button"
-			android:contentDescription="@string/content_description_edit"
-			android:layout_width="60dp"
+		<TextView
+			android:id="@+id/contact_name"
+			style="@style/font6"
+			android:ellipsize="end"
+			android:singleLine="true"
+			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:layout_alignParentRight="true"
+			android:layout_weight="0.4"
+			android:layout_gravity="center"
 			android:padding="15dp"/>
 
 		<ImageView
@@ -34,33 +36,31 @@
 			android:src="@drawable/call_alt_start"
 			android:background="@drawable/toolbar_button"
 			android:contentDescription="@string/content_description_call"
-			android:layout_toLeftOf="@id/edit"
-			android:layout_width="60dp"
+			android:layout_width="0dp"
 			android:layout_height="match_parent"
+			android:layout_weight="0.2"
 			android:padding="15dp"/>
 
 		<ImageView
 			android:id="@+id/back_to_call"
 			android:src="@drawable/call_back"
 			android:background="@drawable/toolbar_button"
-			android:layout_toLeftOf="@id/edit"
-			android:layout_width="60dp"
+			android:layout_width="0dp"
 			android:layout_height="match_parent"
+			android:layout_weight="0.2"
 			android:visibility="gone"
 			android:padding="15dp"/>
 
-		<TextView
-			android:id="@+id/contact_name"
-			style="@style/font6"
-			android:ellipsize="end"
-			android:singleLine="true"
-			android:layout_width="match_parent"
+		<ImageView
+			android:id="@+id/edit"
+			android:src="@drawable/edit_list_button"
+			android:background="@drawable/toolbar_button"
+			android:contentDescription="@string/content_description_edit"
+			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:layout_toRightOf="@id/back"
-			android:layout_toLeftOf="@id/start_call"
-			android:gravity="center_vertical"
-			android:paddingLeft="5dp"/>
-	</RelativeLayout>
+			android:layout_weight="0.2"
+			android:padding="15dp"/>
+	</LinearLayout>
 
 	<include layout="@layout/edit_list"/>
 
@@ -132,6 +132,8 @@
 		android:layout_margin="10dp"
 		android:layout_below="@+id/top_bar"/>
 
+
+
 	<AutoCompleteTextView
 		android:id="@+id/search_contact_field"
 		android:background="@drawable/resizable_textfield"
diff --git a/res/layout/chatlist.xml b/res/layout/chatlist.xml
index f000758c6..24eaf650e 100644
--- a/res/layout/chatlist.xml
+++ b/res/layout/chatlist.xml
@@ -5,43 +5,49 @@
   	android:background="@color/colorH"
     android:orientation="vertical" >
 
-	<RelativeLayout
+	<LinearLayout
 		android:id="@+id/top_bar"
+		android:orientation="horizontal"
+		android:background="@color/colorF"
 		android:layout_width="match_parent"
-		android:layout_height="50dp"
-		android:layout_gravity="top"
-		android:background="@color/colorF">
+		android:layout_height="60dp">
 
 		<ImageView
 			android:id="@+id/new_discussion"
 			android:src="@drawable/chat_add"
 			android:background="@drawable/toolbar_button"
 			android:contentDescription="@string/content_description_new_discussion"
-			android:layout_width="70dp"
+			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:layout_alignParentLeft="true"
-			android:padding="12dp"/>
+			android:layout_weight="0.2"
+			android:padding="15dp"/>
 
 		<ImageView
 			android:id="@+id/back_in_call"
 			android:src="@drawable/call_back"
 			android:background="@drawable/toolbar_button"
-			android:layout_width="70dp"
+			android:contentDescription="@string/content_description_call"
+			android:visibility="invisible"
+			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:padding="12dp"
-			android:visibility="gone"
-			android:layout_toRightOf="@+id/new_discussion"/>
+			android:layout_weight="0.2"
+			android:padding="15dp"/>
+
+		<View
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.4"/>
 
 		<ImageView
 			android:id="@+id/edit"
 			android:src="@drawable/edit_list_button"
 			android:background="@drawable/toolbar_button"
 			android:contentDescription="@string/content_description_edit"
-			android:layout_width="70dp"
+			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:layout_alignParentRight="true"
-			android:padding="12dp"/>
-	</RelativeLayout>
+			android:layout_weight="0.2"
+			android:padding="15dp"/>
+	</LinearLayout>
 
 	<include layout="@layout/edit_list"/>
     
diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index adc9e8197..451a08f5f 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -5,44 +5,48 @@
   	android:background="@color/colorH"
     android:orientation="vertical" >
 
-	<RelativeLayout
+	<LinearLayout
+		android:orientation="horizontal"
+		android:background="@color/colorF"
 		android:layout_width="match_parent"
-		android:layout_height="50dp"
-		android:layout_gravity="bottom"
-		android:background="@color/colorF">
+		android:layout_height="60dp">
 
 		<ImageView
 			android:id="@+id/back"
 			android:src="@drawable/back"
 			android:background="@drawable/toolbar_button"
 			android:contentDescription="@string/content_description_back"
-			android:layout_width="70dp"
+			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:layout_alignParentLeft="true"
+			android:layout_weight="0.2"
+			android:padding="18dp"/>
+
+		<View
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.4"/>
+
+		<ImageView
+			android:id="@+id/deleteContact"
+			android:src="@drawable/delete"
+			android:background="@drawable/toolbar_button"
+			android:contentDescription="@string/content_description_delete"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"
 			android:padding="15dp"/>
 
 		<ImageView
-			android:contentDescription="@string/content_description_edit"
 			android:id="@+id/editContact"
-			android:layout_alignParentRight="true"
-			android:padding="12dp"
 			android:src="@drawable/edit"
 			android:background="@drawable/toolbar_button"
-			android:layout_width="70dp"
-			android:layout_height="match_parent"/>
-
-		<ImageView
-			android:contentDescription="@string/content_description_delete"
-			android:id="@+id/deleteContact"
-			android:padding="12dp"
-			android:src="@drawable/delete"
-			android:background="@drawable/toolbar_button"
-			android:gravity="center"
-			android:layout_width="70dp"
+			android:contentDescription="@string/content_description_edit"
+			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:layout_toLeftOf="@+id/editContact"/>
+			android:layout_weight="0.2"
+			android:padding="15dp"/>
 
-	</RelativeLayout>
+	</LinearLayout>
 
 	<ScrollView
 		android:layout_width="match_parent"
diff --git a/res/layout/contact_edit.xml b/res/layout/contact_edit.xml
index 0aaa87ce9..4a3602d2a 100644
--- a/res/layout/contact_edit.xml
+++ b/res/layout/contact_edit.xml
@@ -5,46 +5,48 @@
   	android:background="@color/colorH"
   	android:orientation="vertical">
 
-	<RelativeLayout
+	<LinearLayout
+		android:orientation="horizontal"
+		android:background="@color/colorF"
 		android:layout_width="match_parent"
-		android:layout_height="50dp"
-		android:layout_gravity="bottom"
-		android:background="@color/colorF">
+		android:layout_height="60dp">
 
 		<ImageView
 			android:id="@+id/back"
 			android:src="@drawable/back"
 			android:background="@drawable/toolbar_button"
 			android:contentDescription="@string/content_description_back"
-			android:layout_width="70dp"
+			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:layout_alignParentLeft="true"
-			android:padding="15dp"/>
+			android:layout_weight="0.2"
+			android:padding="18dp"/>
 
-
-		<ImageView
-			android:id="@+id/ok"
-			android:contentDescription="@string/content_description_valid"
-			android:layout_alignParentRight="true"
-			android:padding="15dp"
-			android:src="@drawable/valid"
-			android:background="@drawable/toolbar_button"
-			android:gravity="center"
-			android:layout_width="70dp"
-			android:layout_height="match_parent"/>
+		<View
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.4"/>
 
 		<ImageView
 			android:id="@+id/deleteContact"
-			android:contentDescription="@string/content_description_delete"
-			android:padding="12dp"
 			android:src="@drawable/delete"
 			android:background="@drawable/toolbar_button"
-			android:gravity="center"
-			android:layout_width="70dp"
+			android:contentDescription="@string/content_description_delete"
+			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:layout_toLeftOf="@+id/ok"/>
+			android:layout_weight="0.2"
+			android:padding="15dp"/>
 
-	</RelativeLayout>
+		<ImageView
+			android:id="@+id/ok"
+			android:src="@drawable/valid"
+			android:background="@drawable/toolbar_button"
+			android:contentDescription="@string/content_description_edit"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"
+			android:padding="18dp"/>
+
+	</LinearLayout>
 
     <ScrollView
         android:id="@+id/controlsScrollView"
diff --git a/res/layout/contacts_list.xml b/res/layout/contacts_list.xml
index b150fbae9..d41886046 100644
--- a/res/layout/contacts_list.xml
+++ b/res/layout/contacts_list.xml
@@ -5,90 +5,84 @@
 	android:background="@color/colorH"
 	android:orientation="vertical" >
 
-	<RelativeLayout
+	<LinearLayout
 		android:id="@+id/top_bar"
+		android:orientation="horizontal"
+		android:background="@color/colorF"
 		android:layout_width="match_parent"
-		android:layout_height="50dp"
-		android:layout_gravity="bottom"
-		android:background="@color/colorF">
-
+		android:layout_height="60dp">
 
 		<RelativeLayout
-			android:id="@+id/all_contacts_layout"
-			android:layout_width="70dp"
-			android:layout_height="wrap_content"
-			android:adjustViewBounds="true">
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2">
 
 			<ImageView
 				android:id="@+id/all_contacts"
-				android:contentDescription="@string/content_description_all_contacts"
-				android:layout_alignParentLeft="true"
 				android:src="@drawable/contacts_all"
 				android:background="@drawable/toolbar_button"
-				android:gravity="center"
-				android:padding="12dp"
+				android:contentDescription="@string/content_description_all_contacts"
+				android:padding="15dp"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"/>
 
-			<RelativeLayout
+			<View
 				android:id="@+id/all_contacts_select"
-				android:contentDescription="@string/content_description_contacts"
 				android:background="@color/colorA"
-				android:layout_alignRight="@id/all_contacts"
 				android:layout_width="match_parent"
 				android:layout_height="5dp"
 				android:layout_alignParentBottom="true"/>
-
 		</RelativeLayout>
 
 		<RelativeLayout
-			android:layout_toRightOf="@id/all_contacts_layout"
-			android:layout_width="70dp"
-			android:layout_height="wrap_content"
-			android:adjustViewBounds="true">
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2">
 
 			<ImageView
-				android:contentDescription="@string/content_description_linphone_contacts"
 				android:id="@+id/linphone_contacts"
 				android:src="@drawable/contacts_sip"
 				android:background="@drawable/toolbar_button"
+				android:contentDescription="@string/content_description_linphone_contacts"
 				android:gravity="center"
-				android:padding="12dp"
+				android:padding="15dp"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"/>
 
-			<RelativeLayout
+			<View
 				android:id="@+id/linphone_contacts_select"
-				android:contentDescription="@string/content_description_contacts"
 				android:background="@color/colorA"
-				android:layout_alignRight="@id/linphone_contacts"
 				android:layout_width="match_parent"
 				android:layout_height="5dp"
-				android:visibility="invisible"
+				android:visibility="gone"
 				android:layout_alignParentBottom="true"/>
-
 		</RelativeLayout>
 
+		<View
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"/>
+
 		<ImageView
 			android:id="@+id/newContact"
 			android:src="@drawable/contact_add"
 			android:background="@drawable/toolbar_button"
-			android:contentDescription="@string/content_description_new_contact"
-			android:layout_width="70dp"
+			android:contentDescription="@string/content_description_edit"
+			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:layout_toLeftOf="@id/edit"
-			android:padding="12dp"/>
+			android:layout_weight="0.2"
+			android:padding="15dp"/>
 
 		<ImageView
 			android:id="@+id/edit"
 			android:src="@drawable/edit_list_button"
 			android:background="@drawable/toolbar_button"
 			android:contentDescription="@string/content_description_edit"
-			android:layout_width="70dp"
+			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:layout_alignParentRight="true"
-			android:padding="12dp"/>
-	</RelativeLayout>
+			android:layout_weight="0.2"
+			android:padding="15dp"/>
+	</LinearLayout>
 
 	<include layout="@layout/edit_list"/>
 
diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index d25293b7c..d30a7d4d3 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -8,7 +8,7 @@
 		android:id="@+id/address_bar"
 		android:background="@color/colorF"
 		android:layout_width="match_parent"
-		android:layout_height="50dp"
+		android:layout_height="60dp"
 		android:layout_marginBottom="10dp"
 		android:layout_alignParentTop="true">
 
@@ -30,7 +30,7 @@
 			android:ellipsize="start"
 			android:inputType="textEmailAddress"
 			android:hint="@string/address_bar_hint"
-			android:layout_width="match_parent"
+			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
 			android:paddingLeft="20dp"
 			android:paddingRight="5dp"
diff --git a/res/layout/edit_list.xml b/res/layout/edit_list.xml
index 62a343288..fb7bfa87b 100644
--- a/res/layout/edit_list.xml
+++ b/res/layout/edit_list.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/edit_list"
+	android:orientation="horizontal"
 	android:background="@color/colorF"
 	android:layout_width="match_parent"
-	android:layout_height="50dp"
+	android:layout_height="60dp"
 	android:visibility="gone">
 
 	<ImageView
@@ -11,40 +12,45 @@
 		android:src="@drawable/cancel_edit"
 		android:background="@drawable/toolbar_button"
 		android:contentDescription="@string/content_description_valid"
-		android:layout_width="70dp"
+		android:layout_width="0dp"
 		android:layout_height="match_parent"
-		android:padding="12dp"
-		android:layout_alignParentLeft="true"/>
+		android:layout_weight="0.2"
+		android:padding="15dp"/>
 
-	<ImageView
-		android:id="@+id/delete"
-		android:src="@drawable/delete"
-		android:background="@drawable/toolbar_button"
-		android:contentDescription="@string/content_description_valid"
-		android:layout_width="70dp"
+	<View
+		android:layout_width="0dp"
 		android:layout_height="match_parent"
-		android:padding="12dp"
-		android:layout_alignParentRight="true"/>
+		android:layout_weight="0.4"/>
 
 	<ImageView
 		android:id="@+id/select_all"
 		android:src="@drawable/select_all"
 		android:background="@drawable/toolbar_button"
 		android:contentDescription="@string/content_description_valid"
-		android:layout_width="70dp"
+		android:layout_width="0dp"
 		android:layout_height="match_parent"
-		android:padding="12dp"
-		android:layout_toLeftOf="@id/delete"/>
+		android:layout_weight="0.2"
+		android:padding="15dp"/>
+
+	<ImageView
+		android:id="@+id/delete"
+		android:src="@drawable/delete"
+		android:background="@drawable/toolbar_button"
+		android:contentDescription="@string/content_description_valid"
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:layout_weight="0.2"
+		android:padding="15dp"/>
 
 	<ImageView
 		android:id="@+id/deselect_all"
 		android:src="@drawable/deselect_all"
 		android:background="@drawable/toolbar_button"
 		android:contentDescription="@string/content_description_valid"
-		android:layout_width="70dp"
+		android:layout_width="0dp"
 		android:layout_height="match_parent"
-		android:padding="12dp"
-		android:layout_toLeftOf="@id/delete"
-		android:visibility="gone"/>
+		android:layout_weight="0.2"
+		android:visibility="gone"
+		android:padding="15dp"/>
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/history.xml b/res/layout/history.xml
index 70278ef35..ed51f7e41 100644
--- a/res/layout/history.xml
+++ b/res/layout/history.xml
@@ -5,77 +5,74 @@
 	android:background="@color/colorH"
 	android:orientation="vertical" >
 
-	<RelativeLayout
+	<LinearLayout
 		android:id="@+id/top_bar"
+		android:orientation="horizontal"
 		android:background="@color/colorF"
 		android:layout_width="match_parent"
-		android:layout_height="50dp"
-		android:layout_gravity="top">
+		android:layout_height="60dp">
 
 		<RelativeLayout
-			android:id="@+id/all_calls_layout"
-			android:layout_width="70dp"
-			android:layout_height="match_parent">
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2">
 
 			<ImageView
 				android:id="@+id/all_calls"
 				android:src="@drawable/history_all"
 				android:background="@drawable/toolbar_button"
-				android:contentDescription="@string/content_description_all_calls"
-				android:gravity="center"
-				android:padding="12dp"
+				android:contentDescription="@string/content_description_all_contacts"
+				android:padding="15dp"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"/>
 
-			<RelativeLayout
+			<View
 				android:id="@+id/all_calls_select"
 				android:background="@color/colorA"
-				android:contentDescription="@string/content_description_contacts"
-				android:layout_alignRight="@id/all_calls"
 				android:layout_width="match_parent"
 				android:layout_height="5dp"
 				android:layout_alignParentBottom="true"/>
-
 		</RelativeLayout>
 
 		<RelativeLayout
-			android:layout_toRightOf="@id/all_calls_layout"
-			android:layout_width="70dp"
+			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:adjustViewBounds="true">
+			android:layout_weight="0.2">
 
 			<ImageView
 				android:id="@+id/missed_calls"
 				android:src="@drawable/history_missed"
 				android:background="@drawable/toolbar_button"
-				android:contentDescription="@string/content_description_missed_calls"
+				android:contentDescription="@string/content_description_linphone_contacts"
 				android:gravity="center"
-				android:padding="12dp"
+				android:padding="15dp"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"/>
 
-			<RelativeLayout
+			<View
 				android:id="@+id/missed_calls_select"
 				android:background="@color/colorA"
-				android:contentDescription="@string/content_description_contacts"
-				android:layout_alignRight="@id/missed_calls"
 				android:layout_width="match_parent"
 				android:layout_height="5dp"
-				android:layout_alignParentBottom="true"
-				android:visibility="gone"/>
-
+				android:visibility="gone"
+				android:layout_alignParentBottom="true"/>
 		</RelativeLayout>
 
+		<View
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.4"/>
+
 		<ImageView
 			android:id="@+id/edit"
 			android:src="@drawable/edit_list_button"
 			android:background="@drawable/toolbar_button"
 			android:contentDescription="@string/content_description_edit"
-			android:layout_width="70dp"
+			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:layout_alignParentRight="true"
-			android:padding="12dp"/>
-	</RelativeLayout>
+			android:layout_weight="0.2"
+			android:padding="15dp"/>
+	</LinearLayout>
 
 	<include layout="@layout/edit_list"/>
 
diff --git a/res/layout/history_detail.xml b/res/layout/history_detail.xml
index f0457c109..2eba11853 100644
--- a/res/layout/history_detail.xml
+++ b/res/layout/history_detail.xml
@@ -5,34 +5,38 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
 
-	<RelativeLayout
+
+	<LinearLayout
+		android:id="@+id/top_bar"
+		android:orientation="horizontal"
 		android:background="@color/colorF"
 		android:layout_width="match_parent"
-		android:layout_height="50dp"
-		android:layout_gravity="bottom">
+		android:layout_height="60dp">
 
 		<ImageView
 			android:id="@+id/back"
 			android:src="@drawable/back"
 			android:background="@drawable/toolbar_button"
-			android:contentDescription="@string/content_description_back"
-			android:padding="15dp"
-			android:layout_width="70dp"
-			android:layout_height="wrap_content"
-			android:layout_alignParentLeft="true"/>
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"
+			android:padding="18dp"/>
+
+		<View
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.6"/>
 
 		<ImageView
 			android:id="@+id/add_contact"
 			android:src="@drawable/contact_add"
 			android:background="@drawable/toolbar_button"
-			android:contentDescription="@string/content_description_add_contact"
-			android:padding="12dp"
-			android:layout_width="70dp"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"/>
-
-	</RelativeLayout>
-
+			android:contentDescription="@string/content_description_edit"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"
+			android:padding="15dp"/>
+	</LinearLayout>
 
 	<ScrollView
 		android:layout_width="match_parent"
diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index 2a226d25f..b4851882d 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -114,7 +114,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 	private TextView contactName, remoteComposing;
 	private ImageView back, backToCall;
 	private AutoCompleteTextView searchContactField;
-	private RelativeLayout topBar, editList;
+	private LinearLayout topBar, editList;
 	private LinearLayout textLayout;
 	private ListView messagesList;
 
@@ -158,9 +158,9 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 		messagesList = (ListView) view.findViewById(R.id.chat_message_list);
 		searchContactField = (AutoCompleteTextView) view.findViewById(R.id.search_contact_field);
 
-		editList = (RelativeLayout) view.findViewById(R.id.edit_list);
+		editList = (LinearLayout) view.findViewById(R.id.edit_list);
 		textLayout = (LinearLayout) view.findViewById(R.id.message_layout);
-		topBar = (RelativeLayout) view.findViewById(R.id.top_bar);
+		topBar = (LinearLayout) view.findViewById(R.id.top_bar);
 
 		sendMessage = (ImageView) view.findViewById(R.id.send_message);
 		sendMessage.setOnClickListener(this);
@@ -593,10 +593,10 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 
 		if(LinphoneManager.getLc().isIncall()){
 			backToCall.setVisibility(View.VISIBLE);
-			startCall.setVisibility(View.INVISIBLE);
+			startCall.setVisibility(View.GONE);
 		} else {
 			if(!newChatConversation) {
-				backToCall.setVisibility(View.INVISIBLE);
+				backToCall.setVisibility(View.GONE);
 				startCall.setVisibility(View.VISIBLE);
 			}
 		}
diff --git a/src/org/linphone/ChatListFragment.java b/src/org/linphone/ChatListFragment.java
index 4e98c63c7..6a65a0d17 100644
--- a/src/org/linphone/ChatListFragment.java
+++ b/src/org/linphone/ChatListFragment.java
@@ -57,6 +57,7 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -70,7 +71,7 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
 	private ListView chatList;
 	private TextView noChatHistory;
 	private ImageView edit, selectAll, deselectAll, delete, newDiscussion, contactPicture, cancel, backInCall;
-	private RelativeLayout editList, topbar;
+	private LinearLayout editList, topbar;
 	private boolean isEditMode = false;
 	
 	@Override
@@ -85,8 +86,8 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
 		
 		noChatHistory = (TextView) view.findViewById(R.id.noChatHistory);
 
-		editList = (RelativeLayout) view.findViewById(R.id.edit_list);
-		topbar = (RelativeLayout) view.findViewById(R.id.top_bar);
+		editList = (LinearLayout) view.findViewById(R.id.edit_list);
+		topbar = (LinearLayout) view.findViewById(R.id.top_bar);
 
 		cancel = (ImageView) view.findViewById(R.id.cancel);
 		cancel.setOnClickListener(this);
@@ -201,7 +202,7 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
 		if (LinphoneManager.getLc().getCallsNb() > 0) {
 			backInCall.setVisibility(View.VISIBLE);
 		} else {
-			backInCall.setVisibility(View.GONE);
+			backInCall.setVisibility(View.INVISIBLE);
 		}
 
 		final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(LinphoneActivity.instance());
diff --git a/src/org/linphone/ContactsListFragment.java b/src/org/linphone/ContactsListFragment.java
index 52815590e..2a3d22070 100644
--- a/src/org/linphone/ContactsListFragment.java
+++ b/src/org/linphone/ContactsListFragment.java
@@ -66,7 +66,8 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 	private TextView noSipContact, noContact;
 	private ImageView allContacts, linphoneContacts, newContact, edit, selectAll, deselectAll, delete, cancel;
 	private boolean onlyDisplayLinphoneContacts, isEditMode;
-	private RelativeLayout allContactsSelected, linphoneContactsSelected, editList, topbar;
+	private View allContactsSelected, linphoneContactsSelected;
+	private LinearLayout editList, topbar;
 	private int lastKnownPosition;
 	private AlphabetIndexer indexer;
 	private boolean editOnClick = false, editConsumed = false, onlyDisplayChatAddress = false;
@@ -110,11 +111,8 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
         linphoneContacts = (ImageView) view.findViewById(R.id.linphone_contacts);
         linphoneContacts.setOnClickListener(this);
 
-		allContactsSelected = (RelativeLayout) view.findViewById(R.id.all_contacts_select);
-		allContactsSelected.setOnClickListener(this);
-
-		linphoneContactsSelected = (RelativeLayout) view.findViewById(R.id.linphone_contacts_select);
-		linphoneContactsSelected.setOnClickListener(this);
+		allContactsSelected = view.findViewById(R.id.all_contacts_select);
+		linphoneContactsSelected = view.findViewById(R.id.linphone_contacts_select);
         
         newContact = (ImageView) view.findViewById(R.id.newContact);
         newContact.setOnClickListener(this);
@@ -132,8 +130,8 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 		delete = (ImageView) view.findViewById(R.id.delete);
 		delete.setOnClickListener(this);
 
-		editList = (RelativeLayout) view.findViewById(R.id.edit_list);
-		topbar = (RelativeLayout) view.findViewById(R.id.top_bar);
+		editList = (LinearLayout) view.findViewById(R.id.edit_list);
+		topbar = (LinearLayout) view.findViewById(R.id.top_bar);
 
 		cancel = (ImageView) view.findViewById(R.id.cancel);
 		cancel.setOnClickListener(this);
diff --git a/src/org/linphone/HistoryListFragment.java b/src/org/linphone/HistoryListFragment.java
index 492155c65..d1a8975dd 100644
--- a/src/org/linphone/HistoryListFragment.java
+++ b/src/org/linphone/HistoryListFragment.java
@@ -61,7 +61,8 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
 	private LayoutInflater mInflater;
 	private TextView noCallHistory, noMissedCallHistory;
 	private ImageView missedCalls, allCalls, edit, selectAll, deselectAll, delete, cancel;
-	private RelativeLayout allCallsSelected, missedCallsSelected, editList, topBar;
+	private View allCallsSelected, missedCallsSelected;
+	private LinearLayout editList, topBar;
 	private boolean onlyDisplayMissedCalls, isEditMode;
 	private List<LinphoneCallLog> mLogs;
 
@@ -80,8 +81,8 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
 		delete = (ImageView) view.findViewById(R.id.delete);
 		delete.setOnClickListener(this);
 
-		editList = (RelativeLayout) view.findViewById(R.id.edit_list);
-		topBar = (RelativeLayout) view.findViewById(R.id.top_bar);
+		editList = (LinearLayout) view.findViewById(R.id.edit_list);
+		topBar = (LinearLayout) view.findViewById(R.id.top_bar);
 
 		cancel = (ImageView) view.findViewById(R.id.cancel);
 		cancel.setOnClickListener(this);
@@ -89,14 +90,12 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
 		allCalls = (ImageView) view.findViewById(R.id.all_calls);
 		allCalls.setOnClickListener(this);
 
-		allCallsSelected = (RelativeLayout) view.findViewById(R.id.all_calls_select);
-		allCallsSelected.setOnClickListener(this);
+		allCallsSelected = view.findViewById(R.id.all_calls_select);
 
 		missedCalls = (ImageView) view.findViewById(R.id.missed_calls);
 		missedCalls.setOnClickListener(this);
 
-		missedCallsSelected = (RelativeLayout) view.findViewById(R.id.missed_calls_select);
-		missedCallsSelected.setOnClickListener(this);
+		missedCallsSelected = view.findViewById(R.id.missed_calls_select);
 
 		selectAll = (ImageView) view.findViewById(R.id.select_all);
 		selectAll.setOnClickListener(this);
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index c2b3d6bce..f76025bf6 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -307,8 +307,8 @@ public class AssistantActivity extends Activity implements OnClickListener {
 	}
 
 	public void loadLinphoneConfig(){
-		LinphoneManager.getInstance().loadConfig();
-		LinphoneManager.getInstance().restartLinphoneCore();
+		//LinphoneManager.getInstance().loadConfig();
+		//LinphoneManager.getInstance().restartLinphoneCore();
 	}
 
 	public void saveCreatedAccount(String username, String password, String displayName, String domain, TransportType transport) {