diff --git a/res/drawable-hdpi/setup_field_background.png b/res/drawable-hdpi/setup_field_background.png
new file mode 100644
index 000000000..242fa035a
Binary files /dev/null and b/res/drawable-hdpi/setup_field_background.png differ
diff --git a/res/drawable-hdpi/setup_label.png b/res/drawable-hdpi/setup_label.png
deleted file mode 100644
index 7b8cb1ed5..000000000
Binary files a/res/drawable-hdpi/setup_label.png and /dev/null differ
diff --git a/res/layout/setup_generic_login.xml b/res/layout/setup_generic_login.xml
index 4fc7e8ff1..f98a78225 100644
--- a/res/layout/setup_generic_login.xml
+++ b/res/layout/setup_generic_login.xml
@@ -36,7 +36,8 @@
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:singleLine="true"
-            android:textColor="@android:color/black" />
+            android:textColor="@android:color/black"
+            android:background="@drawable/setup_field_background" />
         
         <EditText
             android:id="@+id/setup_password"
@@ -44,10 +45,12 @@
             android:layout_height="wrap_content"
             android:hint="@string/setup_password_hint"
             android:inputType="textPassword"
+            android:layout_marginTop="5dp"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:singleLine="true"
-            android:textColor="@android:color/black" />
+            android:textColor="@android:color/black"
+            android:background="@drawable/setup_field_background" />
         
         <EditText
             android:id="@+id/setup_domain"
@@ -55,10 +58,12 @@
             android:layout_height="wrap_content"
             android:hint="@string/setup_domain_hint"
             android:inputType="textEmailAddress"
+            android:layout_marginTop="5dp"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:singleLine="true"
-            android:textColor="@android:color/black" />
+            android:textColor="@android:color/black"
+            android:background="@drawable/setup_field_background" />
         
         <RelativeLayout
 	    	android:paddingTop="10dp"
diff --git a/res/layout/setup_linphone_login.xml b/res/layout/setup_linphone_login.xml
index 6c5ba2212..25ec856cd 100644
--- a/res/layout/setup_linphone_login.xml
+++ b/res/layout/setup_linphone_login.xml
@@ -36,7 +36,8 @@
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:singleLine="true"
-            android:textColor="@android:color/black" />
+            android:textColor="@android:color/black"
+            android:background="@drawable/setup_field_background" />
         
         <EditText
             android:id="@+id/setup_password"
@@ -44,10 +45,12 @@
             android:layout_height="wrap_content"
             android:hint="@string/setup_password_hint"
             android:inputType="textPassword"
+            android:layout_marginTop="5dp"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:singleLine="true"
-            android:textColor="@android:color/black" />
+            android:textColor="@android:color/black"
+            android:background="@drawable/setup_field_background" />
         
         <RelativeLayout
 	    	android:paddingTop="10dp"
diff --git a/res/layout/setup_wizard.xml b/res/layout/setup_wizard.xml
index 9bdd2107c..619c09ac8 100644
--- a/res/layout/setup_wizard.xml
+++ b/res/layout/setup_wizard.xml
@@ -40,7 +40,8 @@
 	            android:paddingLeft="10dp"
 	            android:paddingRight="10dp"
 	            android:singleLine="true"
-	            android:textColor="@android:color/black" />
+	            android:textColor="@android:color/black"
+            	android:background="@drawable/setup_field_background" />
 	        
 	        <ImageView 
 	            android:id="@+id/setup_username_ok"
@@ -54,6 +55,7 @@
         </RelativeLayout>
         
         <RelativeLayout 
+           	android:layout_marginTop="5dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
             
@@ -66,7 +68,8 @@
 	            android:paddingLeft="10dp"
 	            android:paddingRight="10dp"
 	            android:singleLine="true"
-	            android:textColor="@android:color/black" />
+	            android:textColor="@android:color/black"
+            	android:background="@drawable/setup_field_background" />
 	        
 	        <EditText
 	            android:id="@+id/setup_password_confirm"
@@ -78,7 +81,8 @@
 	            android:paddingLeft="10dp"
 	            android:paddingRight="10dp"
 	            android:singleLine="true"
-	            android:textColor="@android:color/black" />
+	            android:textColor="@android:color/black"
+            	android:background="@drawable/setup_field_background" />
 	        
 	        <ImageView 
 	            android:id="@+id/setup_password_ok"
@@ -92,6 +96,7 @@
         </RelativeLayout>
         
         <RelativeLayout 
+           	android:layout_marginTop="5dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
             
@@ -104,7 +109,8 @@
 	            android:paddingLeft="10dp"
 	            android:paddingRight="10dp"
 	            android:singleLine="true"
-	            android:textColor="@android:color/black" />
+	            android:textColor="@android:color/black"
+            	android:background="@drawable/setup_field_background" />
 	        
 	        <ImageView 
 	            android:id="@+id/setup_email_ok"