diff --git a/res/layout/about.xml b/res/layout/about.xml
index edd3a10dc..1006819ba 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="@color/colorH"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorH"
     android:orientation="vertical">
 
     <RelativeLayout
-        android:id="@+id/topbar"
+        android:id="@+id/top_bar"
         android:background="@color/colorF"
         android:layout_width="match_parent"
         android:layout_height="70dp">
@@ -47,7 +47,7 @@
         android:layout_height="wrap_content"/>
 
     <TextView
-        android:id="@+id/AboutText"
+        android:id="@+id/about_text"
         android:text="@string/about_text"
         style="@style/font9"
         android:layout_gravity="center"
@@ -56,7 +56,7 @@
         android:layout_height="wrap_content"/>
 
     <TextView
-        android:id="@+id/AboutLink"
+        android:id="@+id/about_link"
         android:text="@string/about_link"
         android:autoLink="web"
         style="@style/font9"
diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index a3c2dabc1..8c549233d 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -5,7 +5,7 @@
   	android:background="@color/colorH">
 
 	<RelativeLayout
-		android:id="@+id/AddressBar"
+		android:id="@+id/address_bar"
 		android:background="@color/colorF"
 		android:layout_width="match_parent"
 		android:layout_height="60dp"
@@ -13,29 +13,29 @@
 		android:layout_alignParentTop="true">
 
 		<org.linphone.ui.EraseButton
-			android:id="@+id/Erase"
+			android:id="@+id/erase"
+			android:src="@drawable/backspace"
 			android:layout_width="40dp"
 			android:layout_height="wrap_content"
 			android:layout_alignParentRight="true"
 			android:layout_centerVertical="true"
 			android:layout_marginRight="10dp"
-			android:layout_marginLeft="10dp"
-			android:src="@drawable/backspace" />
+			android:layout_marginLeft="10dp" />
 
 		<org.linphone.ui.AddressText
-			android:id="@+id/Address"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
+			android:id="@+id/address"
 			android:background="@color/colorF"
+			android:textColorHint="@color/colorE"
+			style="@style/font5"
 			android:ellipsize="start"
 			android:inputType="textEmailAddress"
 			android:hint="@string/address_bar_hint"
-			android:textColorHint="@color/colorE"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
 			android:paddingLeft="20dp"
 			android:paddingRight="5dp"
-			android:layout_toLeftOf="@id/Erase"
-			android:layout_centerVertical="true"
-			style="@style/font5"/>
+			android:layout_toLeftOf="@id/erase"
+			android:layout_centerVertical="true"/>
 
 	</RelativeLayout>
 
@@ -47,33 +47,31 @@
         android:layout_height="70dp">
 
 		<RelativeLayout
+			android:focusable="true"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:focusable="true"
-			android:background="@drawable/toolbar_button"
 			android:adjustViewBounds="true">
 
 			<ImageView
-				android:id="@+id/addContact"
+				android:id="@+id/add_contact"
+				android:src="@drawable/contact_add_button"
+				android:background="@drawable/toolbar_button"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:padding="20dp"
-				android:contentDescription="@string/content_description_contacts"
-				android:src="@drawable/contact_add_button"
 				android:layout_alignParentBottom="true"/>
 
 		</RelativeLayout>
 
         <org.linphone.ui.CallButton
-			android:id="@+id/Call"
-            android:contentDescription="@string/content_description_call"
+			android:id="@+id/call"
+			android:src="@drawable/call_audio_start"
 			android:background="@drawable/call"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
 			android:padding="15dp"
-            android:layout_weight="0.5"
-            android:src="@drawable/call_audio_start" />
+            android:layout_weight="0.5"/>
 
 	</LinearLayout>
 	
@@ -84,7 +82,7 @@
         android:layout_height="match_parent"
 		android:padding="10dp"
         android:layout_above="@id/controls"
-        android:layout_below="@id/AddressBar"
+        android:layout_below="@id/address_bar"
 		android:layout_centerInParent="true"/>
 
 </RelativeLayout>
diff --git a/src/org/linphone/AboutFragment.java b/src/org/linphone/AboutFragment.java
index eb5a50799..1dde66f4c 100644
--- a/src/org/linphone/AboutFragment.java
+++ b/src/org/linphone/AboutFragment.java
@@ -43,7 +43,7 @@ public class AboutFragment extends Fragment implements OnClickListener {
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View view = inflater.inflate(R.layout.about, container, false);
 
-		TextView aboutText = (TextView) view.findViewById(R.id.AboutText);
+		TextView aboutText = (TextView) view.findViewById(R.id.about_text);
 		try {
 			aboutText.setText(String.format(getString(R.string.about_text), getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0).versionName));
 		} catch (NameNotFoundException e) {
diff --git a/src/org/linphone/DialerFragment.java b/src/org/linphone/DialerFragment.java
index ed947c6fc..f8bbd1be1 100644
--- a/src/org/linphone/DialerFragment.java
+++ b/src/org/linphone/DialerFragment.java
@@ -56,13 +56,13 @@ public class DialerFragment extends Fragment {
 		instance = this;
         View view = inflater.inflate(R.layout.dialer, container, false);
 		
-		mAddress = (AddressText) view.findViewById(R.id.Address);
+		mAddress = (AddressText) view.findViewById(R.id.address);
 		mAddress.setDialerFragment(this);
 		
-		EraseButton erase = (EraseButton) view.findViewById(R.id.Erase);
+		EraseButton erase = (EraseButton) view.findViewById(R.id.erase);
 		erase.setAddressWidget(mAddress);
 		
-		mCall = (CallButton) view.findViewById(R.id.Call);
+		mCall = (CallButton) view.findViewById(R.id.call);
 		mCall.setAddressWidget(mAddress);
 		if (LinphoneActivity.isInstanciated() && LinphoneManager.getLc().getCallsNb() > 0) {
 			if (isCallTransferOngoing) {
@@ -79,7 +79,7 @@ public class DialerFragment extends Fragment {
 			numpad.setAddressWidget(mAddress);
 		}
 		
-		mAddContact = (ImageView) view.findViewById(R.id.addContact);
+		mAddContact = (ImageView) view.findViewById(R.id.add_contact);
 		mAddContact.setEnabled(!(LinphoneActivity.isInstanciated() && LinphoneManager.getLc().getCallsNb() > 0));
 		
 		addContactListener = new OnClickListener() {