diff --git a/res/drawable-hdpi/chat_default.png b/res/drawable-hdpi/chat_default.png
index 5e9716cc8..40392141a 100644
Binary files a/res/drawable-hdpi/chat_default.png and b/res/drawable-hdpi/chat_default.png differ
diff --git a/res/drawable-hdpi/chat_over.png b/res/drawable-hdpi/chat_over.png
index 1d945dbfd..d8482543f 100644
Binary files a/res/drawable-hdpi/chat_over.png and b/res/drawable-hdpi/chat_over.png differ
diff --git a/res/drawable-hdpi/chat_selected.png b/res/drawable-hdpi/chat_selected.png
index 2638c0c10..86823325d 100644
Binary files a/res/drawable-hdpi/chat_selected.png and b/res/drawable-hdpi/chat_selected.png differ
diff --git a/res/drawable-hdpi/contacts_default.png b/res/drawable-hdpi/contacts_default.png
index 88039d6c5..9f8c57147 100644
Binary files a/res/drawable-hdpi/contacts_default.png and b/res/drawable-hdpi/contacts_default.png differ
diff --git a/res/drawable-hdpi/contacts_over.png b/res/drawable-hdpi/contacts_over.png
index 1cf7fd7ab..88a86b8a7 100644
Binary files a/res/drawable-hdpi/contacts_over.png and b/res/drawable-hdpi/contacts_over.png differ
diff --git a/res/drawable-hdpi/contacts_selected.png b/res/drawable-hdpi/contacts_selected.png
index baf14ed3e..dc033743c 100644
Binary files a/res/drawable-hdpi/contacts_selected.png and b/res/drawable-hdpi/contacts_selected.png differ
diff --git a/res/drawable-hdpi/history_default.png b/res/drawable-hdpi/history_default.png
index 866a25a77..2d3fed230 100644
Binary files a/res/drawable-hdpi/history_default.png and b/res/drawable-hdpi/history_default.png differ
diff --git a/res/drawable-hdpi/history_over.png b/res/drawable-hdpi/history_over.png
index fbcaec907..6e9a4cdff 100644
Binary files a/res/drawable-hdpi/history_over.png and b/res/drawable-hdpi/history_over.png differ
diff --git a/res/drawable-hdpi/history_selected.png b/res/drawable-hdpi/history_selected.png
index b672b21f3..5154e603e 100644
Binary files a/res/drawable-hdpi/history_selected.png and b/res/drawable-hdpi/history_selected.png differ
diff --git a/res/drawable-hdpi/settings_default.png b/res/drawable-hdpi/settings_default.png
index ecf4ab11b..f7059430d 100644
Binary files a/res/drawable-hdpi/settings_default.png and b/res/drawable-hdpi/settings_default.png differ
diff --git a/res/drawable-hdpi/settings_over.png b/res/drawable-hdpi/settings_over.png
index 37339b4af..d36d535b9 100644
Binary files a/res/drawable-hdpi/settings_over.png and b/res/drawable-hdpi/settings_over.png differ
diff --git a/res/drawable-hdpi/settings_selected.png b/res/drawable-hdpi/settings_selected.png
index 1befba3bf..1dfca0180 100644
Binary files a/res/drawable-hdpi/settings_selected.png and b/res/drawable-hdpi/settings_selected.png differ
diff --git a/res/drawable-hdpi/setup_back_default.png b/res/drawable-hdpi/setup_back_default.png
index d71825b83..ba7b27360 100644
Binary files a/res/drawable-hdpi/setup_back_default.png and b/res/drawable-hdpi/setup_back_default.png differ
diff --git a/res/drawable-hdpi/setup_cancel_default.png b/res/drawable-hdpi/setup_cancel_default.png
index 43635712e..3de15c99a 100644
Binary files a/res/drawable-hdpi/setup_cancel_default.png and b/res/drawable-hdpi/setup_cancel_default.png differ
diff --git a/res/drawable-hdpi/setup_letsgo_default.png b/res/drawable-hdpi/setup_letsgo_default.png
index 8719b6507..b0f7aa709 100644
Binary files a/res/drawable-hdpi/setup_letsgo_default.png and b/res/drawable-hdpi/setup_letsgo_default.png differ
diff --git a/res/drawable/text_color_setup_next.xml b/res/drawable/text_color_setup_next.xml
new file mode 100644
index 000000000..14bf31b9c
--- /dev/null
+++ b/res/drawable/text_color_setup_next.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+     <item android:state_pressed="true"
+           android:color="@color/text_over" />
+     <item android:state_enabled="false"
+           android:color="@color/text_default" /> 
+     <item android:color="@color/text_selected" />
+ </selector>
\ No newline at end of file
diff --git a/res/layout/menu_about_chat_button.xml b/res/layout/menu_about_chat_button.xml
index 98c73052b..6c48d528c 100644
--- a/res/layout/menu_about_chat_button.xml
+++ b/res/layout/menu_about_chat_button.xml
@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_alignBottom="@id/image"
-        android:paddingBottom="5dp"
+        android:paddingBottom="10dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_about" />
     
diff --git a/res/layout/menu_about_settings_button.xml b/res/layout/menu_about_settings_button.xml
index 61b445dc4..82bca608d 100644
--- a/res/layout/menu_about_settings_button.xml
+++ b/res/layout/menu_about_settings_button.xml
@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_alignBottom="@id/image"
-        android:paddingBottom="5dp"
+        android:paddingBottom="10dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_about" />
     
diff --git a/res/layout/menu_chat_button.xml b/res/layout/menu_chat_button.xml
index 8d9b77cb2..aa6dd79ca 100644
--- a/res/layout/menu_chat_button.xml
+++ b/res/layout/menu_chat_button.xml
@@ -20,7 +20,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_alignBottom="@id/image"
-        android:paddingBottom="5dp"
+        android:paddingBottom="10dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_chat" />
     
diff --git a/res/layout/menu_contact_button.xml b/res/layout/menu_contact_button.xml
index 1d38ade0d..922005363 100644
--- a/res/layout/menu_contact_button.xml
+++ b/res/layout/menu_contact_button.xml
@@ -21,7 +21,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_alignBottom="@id/image"
-        android:paddingBottom="5dp"
+        android:paddingBottom="10dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_contacts" />
     
diff --git a/res/layout/menu_history_button.xml b/res/layout/menu_history_button.xml
index d2eb10dd8..6b0770102 100644
--- a/res/layout/menu_history_button.xml
+++ b/res/layout/menu_history_button.xml
@@ -20,7 +20,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_alignBottom="@id/image"
-        android:paddingBottom="5dp"
+        android:paddingBottom="10dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_history" />
     
diff --git a/res/layout/menu_settings_button.xml b/res/layout/menu_settings_button.xml
index 267785be9..e0b43ca16 100644
--- a/res/layout/menu_settings_button.xml
+++ b/res/layout/menu_settings_button.xml
@@ -21,7 +21,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_alignBottom="@id/image"
-        android:paddingBottom="5dp"
+        android:paddingBottom="10dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_settings" />
     
diff --git a/res/layout/setup.xml b/res/layout/setup.xml
index 06e11bd44..bd648a0fc 100644
--- a/res/layout/setup.xml
+++ b/res/layout/setup.xml
@@ -46,36 +46,11 @@
 		android:layout_alignParentBottom="true"
 		android:orientation="horizontal">
 	    
-		<ImageView 
-			android:contentDescription="@string/content_description_cancel"
-			android:id="@+id/setup_cancel"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:src="@drawable/setup_cancel"
-			android:adjustViewBounds="true"
-			android:scaleType="fitXY"
-			android:layout_weight="0.5"/>
+		<include layout="@layout/setup_cancel_button" />
 		          
-		<ImageView 
-			android:contentDescription="@string/content_description_next"
-			android:id="@+id/setup_next"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:src="@drawable/setup_next"
-			android:adjustViewBounds="true"
-			android:scaleType="fitXY"
-			android:layout_weight="0.5"/>
-		         
-		<ImageView 
-			android:contentDescription="@string/content_description_back"
-			android:id="@+id/setup_back"
-			android:visibility="gone"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:src="@drawable/setup_back"
-			android:adjustViewBounds="true"
-			android:scaleType="fitXY"
-			android:layout_weight="0.5"/>
+		<include layout="@layout/setup_next_button" />
+		
+		<include layout="@layout/setup_back_button" />    
 	  
 	</LinearLayout>
  
diff --git a/res/layout/setup_back_button.xml b/res/layout/setup_back_button.xml
new file mode 100644
index 000000000..87c6eadc6
--- /dev/null
+++ b/res/layout/setup_back_button.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/setup_back"
+	android:visibility="gone"
+	android:layout_weight="0.5"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+    
+    <ImageView 
+        android:id="@+id/image"
+		android:contentDescription="@string/content_description_back"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:src="@drawable/setup_back"
+		android:adjustViewBounds="true"
+		android:scaleType="fitXY" />
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_alignBottom="@id/image"
+        android:paddingBottom="10dp"
+        android:textColor="@drawable/text_color"
+        android:text="@string/button_setup_back" />
+    
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/setup_cancel_button.xml b/res/layout/setup_cancel_button.xml
new file mode 100644
index 000000000..be0cbf564
--- /dev/null
+++ b/res/layout/setup_cancel_button.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/setup_cancel"
+	android:layout_weight="0.5"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+    
+    <ImageView 
+        android:id="@+id/image"
+		android:contentDescription="@string/content_description_cancel"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:src="@drawable/setup_cancel"
+		android:adjustViewBounds="true"
+		android:scaleType="fitXY"/>
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_alignBottom="@id/image"
+        android:paddingBottom="10dp"
+        android:textColor="@drawable/text_color"
+        android:text="@string/button_setup_cancel" />
+    
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/setup_next_button.xml b/res/layout/setup_next_button.xml
new file mode 100644
index 000000000..f9eabd6ed
--- /dev/null
+++ b/res/layout/setup_next_button.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/setup_next"
+	android:layout_weight="0.5"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+    
+    <ImageView 
+        android:id="@+id/image"
+		android:contentDescription="@string/content_description_next"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:src="@drawable/setup_next"
+		android:adjustViewBounds="true"
+		android:scaleType="fitXY" />
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_alignBottom="@id/image"
+        android:paddingBottom="10dp"
+        android:textColor="@drawable/text_color_setup_next"
+        android:text="@string/button_setup_next" />
+    
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a9956a6cd..c3eea92f3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -325,4 +325,8 @@
 	<string name="button_chat">Chat</string>
 	<string name="button_about">About</string>
 	
+	<string name="button_setup_cancel">Cancel</string>
+	<string name="button_setup_back">Back</string>
+	<string name="button_setup_next">Let\'s go</string>
+	
 </resources>
diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java
index ac44d7024..12a707060 100644
--- a/src/org/linphone/setup/SetupActivity.java
+++ b/src/org/linphone/setup/SetupActivity.java
@@ -32,14 +32,14 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.Toast;
 /**
  * @author Sylvain Berfini
  */
 public class SetupActivity extends FragmentActivity implements OnClickListener {
 	private static SetupActivity instance;
-	private ImageView back, next, cancel;
+	private RelativeLayout back, next, cancel;
 	private SetupFragments currentFragment;
 	private SharedPreferences mPref;
 	
@@ -69,11 +69,11 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
 	}
 	
 	private void initUI() {
-		back = (ImageView) findViewById(R.id.setup_back);
+		back = (RelativeLayout) findViewById(R.id.setup_back);
 		back.setOnClickListener(this);
-		next = (ImageView) findViewById(R.id.setup_next);
+		next = (RelativeLayout) findViewById(R.id.setup_next);
 		next.setOnClickListener(this);
-		cancel = (ImageView) findViewById(R.id.setup_cancel);
+		cancel = (RelativeLayout) findViewById(R.id.setup_cancel);
 		cancel.setOnClickListener(this);
 	}