diff --git a/res/layout-FR/chat.xml b/res/layout-FR/chat.xml
index 0261f0a39..8acf785ba 100644
--- a/res/layout-FR/chat.xml
+++ b/res/layout-FR/chat.xml
@@ -81,6 +81,7 @@
             android:paddingRight="5dp" />
         
         <EditText
+            android:textCursorDrawable="@null"
             android:id="@+id/message"
             android:inputType="textMultiLine"
             android:maxLines="3"
diff --git a/res/layout-RU/chat.xml b/res/layout-RU/chat.xml
index 71fa3e15f..6f0b5b4c0 100644
--- a/res/layout-RU/chat.xml
+++ b/res/layout-RU/chat.xml
@@ -81,6 +81,7 @@
             android:paddingRight="1dp" />
         
         <EditText
+            android:textCursorDrawable="@null"
             android:id="@+id/message"
             android:inputType="textMultiLine"
             android:maxLines="3"
diff --git a/res/layout-small/chat.xml b/res/layout-small/chat.xml
index 2b7e19265..251e5f60d 100644
--- a/res/layout-small/chat.xml
+++ b/res/layout-small/chat.xml
@@ -81,6 +81,7 @@
             android:paddingRight="7dp" />
         
         <EditText
+            android:textCursorDrawable="@null"
             android:id="@+id/message"
             android:inputType="textMultiLine"
             android:maxLines="3"
diff --git a/res/layout-small/setup_generic_login.xml b/res/layout-small/setup_generic_login.xml
index 42abbe140..0af4722f8 100644
--- a/res/layout-small/setup_generic_login.xml
+++ b/res/layout-small/setup_generic_login.xml
@@ -30,6 +30,7 @@
 	    android:orientation="vertical">
         
         <EditText
+            android:textCursorDrawable="@null"
             android:id="@+id/setup_username"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -42,6 +43,7 @@
             android:background="@drawable/setup_field_background" />
         
         <EditText
+            android:textCursorDrawable="@null"
             android:id="@+id/setup_password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -55,6 +57,7 @@
             android:background="@drawable/setup_field_background" />
         
         <EditText
+            android:textCursorDrawable="@null"
             android:id="@+id/setup_domain"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout-small/setup_linphone_login.xml b/res/layout-small/setup_linphone_login.xml
index c82f33dc4..3ac5e20e8 100644
--- a/res/layout-small/setup_linphone_login.xml
+++ b/res/layout-small/setup_linphone_login.xml
@@ -30,6 +30,7 @@
 	    android:orientation="vertical">
         
         <EditText
+            android:textCursorDrawable="@null"
             android:id="@+id/setup_username"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -42,6 +43,7 @@
             android:background="@drawable/setup_field_background" />
         
         <EditText
+            android:textCursorDrawable="@null"
             android:id="@+id/setup_password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout-small/setup_wizard.xml b/res/layout-small/setup_wizard.xml
index 3531366a8..d04f65fe8 100644
--- a/res/layout-small/setup_wizard.xml
+++ b/res/layout-small/setup_wizard.xml
@@ -34,6 +34,7 @@
             android:layout_height="wrap_content">
             
 	        <EditText
+            	android:textCursorDrawable="@null"
 	            android:id="@+id/setup_username"
 	            android:layout_width="match_parent"
 	            android:layout_height="wrap_content"
@@ -63,6 +64,7 @@
             android:layout_height="wrap_content">
             
 	        <EditText
+            	android:textCursorDrawable="@null"
 	            android:id="@+id/setup_password"
 	            android:layout_width="match_parent"
 	            android:layout_height="wrap_content"
@@ -75,6 +77,7 @@
             	android:background="@drawable/setup_field_background" />
 	        
 	        <EditText
+            	android:textCursorDrawable="@null"
 	            android:id="@+id/setup_password_confirm"
 	            android:layout_width="match_parent"
 	            android:layout_height="wrap_content"
@@ -108,6 +111,7 @@
             android:layout_height="wrap_content">
             
         	<EditText
+            	android:textCursorDrawable="@null"
 	            android:id="@+id/setup_email"
 	            android:layout_width="match_parent"
 	            android:layout_height="wrap_content"
diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index d00a18240..10e650ac2 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -81,6 +81,7 @@
             android:paddingRight="10dp" />
         
         <EditText
+            android:textCursorDrawable="@null"
             android:id="@+id/message"
             android:inputType="textMultiLine"
             android:maxLines="3"
diff --git a/res/layout/chatlist.xml b/res/layout/chatlist.xml
index 608ebdaa2..5532560f0 100644
--- a/res/layout/chatlist.xml
+++ b/res/layout/chatlist.xml
@@ -70,6 +70,7 @@
 	        android:paddingRight="5dp"/>
         
 	    <EditText
+            android:textCursorDrawable="@null"
 	        android:id="@+id/newFastChat"
 	        android:layout_width="match_parent"
 	        android:layout_height="wrap_content"
diff --git a/res/layout/contact_add_row.xml b/res/layout/contact_add_row.xml
index 6bc90efed..5587cbad0 100644
--- a/res/layout/contact_add_row.xml
+++ b/res/layout/contact_add_row.xml
@@ -16,6 +16,7 @@
         android:gravity="left" />
    	
    	<EditText
+        android:textCursorDrawable="@null"
         android:id="@+id/numoraddr"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/res/layout/contact_edit_row.xml b/res/layout/contact_edit_row.xml
index 4c6b13a80..4086209f4 100644
--- a/res/layout/contact_edit_row.xml
+++ b/res/layout/contact_edit_row.xml
@@ -16,6 +16,7 @@
         android:gravity="left" />
    	
    	<EditText
+        android:textCursorDrawable="@null"
         android:id="@+id/numoraddr"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/res/layout/edit_contact.xml b/res/layout/edit_contact.xml
index b2c507252..f5e050883 100644
--- a/res/layout/edit_contact.xml
+++ b/res/layout/edit_contact.xml
@@ -72,6 +72,7 @@
 			        android:orientation="vertical">
 			        
 			        <EditText
+            			android:textCursorDrawable="@null"
 				        android:id="@+id/contactLastName"
 				        android:layout_width="match_parent"
 				        android:layout_height="wrap_content"
@@ -83,6 +84,7 @@
 				        android:inputType="textPersonName|textCapWords"/>
 			        
 			        <EditText
+            			android:textCursorDrawable="@null"
 				        android:id="@+id/contactFirstName"
 				        android:layout_width="match_parent"
 				        android:layout_height="wrap_content"
diff --git a/res/layout/setup_generic_login.xml b/res/layout/setup_generic_login.xml
index d798503a4..44d4b7a09 100644
--- a/res/layout/setup_generic_login.xml
+++ b/res/layout/setup_generic_login.xml
@@ -29,6 +29,7 @@
 	    android:orientation="vertical">
         
         <EditText
+            android:textCursorDrawable="@null"
             android:id="@+id/setup_username"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -41,6 +42,7 @@
             android:background="@drawable/setup_field_background" />
         
         <EditText
+            android:textCursorDrawable="@null"
             android:id="@+id/setup_password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -54,6 +56,7 @@
             android:background="@drawable/setup_field_background" />
         
         <EditText
+            android:textCursorDrawable="@null"
             android:id="@+id/setup_domain"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout/setup_linphone_login.xml b/res/layout/setup_linphone_login.xml
index cdf1efaa1..7a2fda6ba 100644
--- a/res/layout/setup_linphone_login.xml
+++ b/res/layout/setup_linphone_login.xml
@@ -29,6 +29,7 @@
 	    android:orientation="vertical">
         
         <EditText
+            android:textCursorDrawable="@null"
             android:id="@+id/setup_username"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -41,6 +42,7 @@
             android:background="@drawable/setup_field_background" />
         
         <EditText
+            android:textCursorDrawable="@null"
             android:id="@+id/setup_password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout/setup_wizard.xml b/res/layout/setup_wizard.xml
index 535d5f573..8263ca30a 100644
--- a/res/layout/setup_wizard.xml
+++ b/res/layout/setup_wizard.xml
@@ -33,6 +33,7 @@
             android:layout_height="wrap_content">
             
 	        <EditText
+	            android:textCursorDrawable="@null"
 	            android:id="@+id/setup_username"
 	            android:layout_width="match_parent"
 	            android:layout_height="wrap_content"
@@ -62,6 +63,7 @@
             android:layout_height="wrap_content">
             
 	        <EditText
+	            android:textCursorDrawable="@null"
 	            android:id="@+id/setup_password"
 	            android:layout_width="match_parent"
 	            android:layout_height="wrap_content"
@@ -74,6 +76,7 @@
             	android:background="@drawable/setup_field_background" />
 	        
 	        <EditText
+	            android:textCursorDrawable="@null"
 	            android:id="@+id/setup_password_confirm"
 	            android:layout_width="match_parent"
 	            android:layout_height="wrap_content"
@@ -104,6 +107,7 @@
             android:layout_height="wrap_content">
             
         	<EditText
+	            android:textCursorDrawable="@null"
 	            android:id="@+id/setup_email"
 	            android:layout_width="match_parent"
 	            android:layout_height="wrap_content"