diff --git a/res/drawable-xlarge-land-hdpi/mark.png b/res/drawable-xlarge-land-hdpi/mark.png
index a2c57acc1..032e5fb0a 100644
Binary files a/res/drawable-xlarge-land-hdpi/mark.png and b/res/drawable-xlarge-land-hdpi/mark.png differ
diff --git a/res/layout-xlarge-land/dialer.xml b/res/layout-xlarge-land/dialer.xml
index fc24bd40c..5c04c2913 100644
--- a/res/layout-xlarge-land/dialer.xml
+++ b/res/layout-xlarge-land/dialer.xml
@@ -8,7 +8,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
 	    android:layout_alignParentTop="true"
+        android:focusable="true"
+		android:focusableInTouchMode="true"
        	android:layout_gravity="center">
+       	<!-- focusable/focusableInTouchMode are set to true to prevent the keyboard to be displayed automatically -->
         
 	    <org.linphone.ui.AddressText
 	        android:id="@+id/Adress"
diff --git a/res/layout-xlarge-land/main.xml b/res/layout-xlarge-land/main.xml
index 974d2ab25..ffa23aed7 100644
--- a/res/layout-xlarge-land/main.xml
+++ b/res/layout-xlarge-land/main.xml
@@ -4,16 +4,71 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
+    <!-- Hack to adjust perfectly on every screen the bottom of the fragment with the curved menu -->
+    <LinearLayout
+	    android:id="@+id/mark"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
+    
+		<ImageView
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+		    android:layout_weight="0.2"
+		    android:adjustViewBounds="true"
+		    android:scaleType="fitXY"
+		    android:src="@drawable/mark"
+		    android:visibility="invisible" />
+		
+		<ImageView
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+		    android:layout_weight="0.2"
+		    android:adjustViewBounds="true"
+		    android:scaleType="fitXY"
+		    android:src="@drawable/mark"
+		    android:visibility="invisible" />
+		
+		<ImageView
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+		    android:layout_weight="0.25"
+		    android:adjustViewBounds="true"
+		    android:scaleType="fitEnd"
+		    android:src="@drawable/dialer"
+		    android:visibility="invisible" />
+		
+		<ImageView
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+		    android:layout_weight="0.2"
+		    android:adjustViewBounds="true"
+		    android:scaleType="fitXY"
+		    android:src="@drawable/mark"
+		    android:visibility="invisible" />
+		
+		<ImageView
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+		    android:layout_weight="0.2"
+		    android:adjustViewBounds="true"
+		    android:scaleType="fitXY"
+		    android:src="@drawable/mark"
+		    android:visibility="invisible" />
+        
+    </LinearLayout>
+    
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_above="@id/mark"
         android:layout_alignParentTop="true" >
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="horizontal"
-            android:paddingBottom="70dp"
             android:paddingTop="20dp">
         
 	        <LinearLayout
@@ -127,6 +182,7 @@
                 android:textSize="20dp"
                 android:visibility="gone" />
         </RelativeLayout>
+        
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-xlarge-land/settings.xml b/res/layout-xlarge-land/settings.xml
new file mode 100644
index 000000000..75e6e7575
--- /dev/null
+++ b/res/layout-xlarge-land/settings.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+       
+    <!-- Hack to adjust perfectly on every screen the bottom of the fragment with the curved menu -->
+    <LinearLayout
+	    android:id="@+id/mark"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
+    
+		<ImageView
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+		    android:layout_weight="0.2"
+		    android:adjustViewBounds="true"
+		    android:scaleType="fitXY"
+		    android:src="@drawable/mark"
+		    android:visibility="invisible" />
+		
+		<ImageView
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+		    android:layout_weight="0.2"
+		    android:adjustViewBounds="true"
+		    android:scaleType="fitXY"
+		    android:src="@drawable/mark"
+		    android:visibility="invisible" />
+		
+		<ImageView
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+		    android:layout_weight="0.25"
+		    android:adjustViewBounds="true"
+		    android:scaleType="fitEnd"
+		    android:src="@drawable/dialer"
+		    android:visibility="invisible" />
+		
+		<ImageView
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+		    android:layout_weight="0.2"
+		    android:adjustViewBounds="true"
+		    android:scaleType="fitXY"
+		    android:src="@drawable/mark"
+		    android:visibility="invisible" />
+		
+		<ImageView
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+		    android:layout_weight="0.2"
+		    android:adjustViewBounds="true"
+		    android:scaleType="fitXY"
+		    android:src="@drawable/mark"
+		    android:visibility="invisible" />
+        
+    </LinearLayout>
+		
+	<ListView
+	    android:id="@android:id/list"
+        android:listSelector="@drawable/list_selector" 
+        android:cacheColorHint="@color/transparent"
+        android:layout_above="@id/mark"
+	    android:layout_width="match_parent"
+	    android:layout_height="match_parent" />
+    
+	<LinearLayout
+        android:id="@+id/menu"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal" >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.2" >
+
+            <ImageView
+                android:id="@+id/history"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+				android:adjustViewBounds="true"
+                android:contentDescription="@string/content_description_history"
+                android:scaleType="fitXY"
+                android:src="@drawable/history" />
+
+            <TextView
+                android:id="@+id/missedCalls"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentTop="true"
+                android:background="@drawable/missed_calls_bg"
+                android:gravity="center"
+                android:textSize="20dp"
+                android:visibility="gone" />
+        </RelativeLayout>
+
+        <ImageView
+            android:id="@+id/contacts"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.2"
+			android:adjustViewBounds="true"
+            android:contentDescription="@string/content_description_contacts"
+            android:scaleType="fitXY"
+            android:src="@drawable/contacts" />
+
+        <ImageView
+            android:id="@+id/dialer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.25"
+			android:adjustViewBounds="true"
+            android:contentDescription="@string/content_description_dialer"
+            android:scaleType="fitEnd"
+            android:src="@drawable/dialer" />
+
+        <ImageView
+            android:id="@+id/settings"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.2"
+			android:adjustViewBounds="true"
+            android:contentDescription="@string/content_description_settings"
+            android:scaleType="fitXY"
+            android:src="@drawable/settings" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.2" >
+
+            <ImageView
+                android:id="@+id/chat"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+				android:adjustViewBounds="true"
+                android:contentDescription="@string/content_description_chat"
+                android:scaleType="fitXY"
+                android:src="@drawable/chat" />
+
+            <TextView
+                android:id="@+id/missedChats"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentTop="true"
+                android:background="@drawable/missed_calls_bg"
+                android:gravity="center"
+                android:textSize="20dp"
+                android:visibility="gone" />
+        </RelativeLayout>
+        
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/org/linphone/DialerFragment.java b/src/org/linphone/DialerFragment.java
index 80a8c8650..abdb1f066 100644
--- a/src/org/linphone/DialerFragment.java
+++ b/src/org/linphone/DialerFragment.java
@@ -51,12 +51,12 @@ public class DialerFragment extends Fragment {
         Bundle savedInstanceState) {
 		instance = this;
         View view = inflater.inflate(R.layout.dialer, container, false);
-        
+		
 		mAddress = (AddressText) view.findViewById(R.id.Adress); 
 		mAddress.setDialerFragment(this);
+		
 		EraseButton erase = (EraseButton) view.findViewById(R.id.Erase);
 		erase.setAddressWidget(mAddress);
-		erase.requestFocus();
 		
 		mCall = (CallButton) view.findViewById(R.id.Call);
 		mCall.setAddressWidget(mAddress);
@@ -71,8 +71,9 @@ public class DialerFragment extends Fragment {
 		}
 		
 		AddressAware numpad = (AddressAware) view.findViewById(R.id.Dialer);
-		if (numpad != null)
+		if (numpad != null) {
 			numpad.setAddressWidget(mAddress);
+		}
 		
 		mAddContact = (ImageView) view.findViewById(R.id.addContact);
 		
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 7d8b33d1b..c14bfc30f 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -124,7 +124,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
 		}
 
         setContentView(R.layout.main);
-        instance = this;
+        instance = this;		
         initButtons();
 		
         currentFragment = FragmentsAvailable.DIALER;
@@ -171,6 +171,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
 		changeCurrentFragment(newFragmentType, extras, false);
 	}
 	
+	@SuppressWarnings("incomplete-switch")
 	private void changeCurrentFragment(FragmentsAvailable newFragmentType, Bundle extras, boolean withoutAnimation) {		
 		if (newFragmentType == currentFragment && newFragmentType != FragmentsAvailable.CHAT) {
 			return;
@@ -438,6 +439,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
 		chat.setSelected(false);
 	}
 	
+	@SuppressWarnings("incomplete-switch")
 	public void selectMenu(FragmentsAvailable menuToSelect) {
 		currentFragment = menuToSelect;
 		resetSelection();
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index 549ee7685..15d71cd6e 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -603,6 +603,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
 			} else {
 				FileInputStream fis = new FileInputStream(uriString);
 				mRingerPlayer.setDataSource(fis.getFD());
+				fis.close();
 			}
 		} catch (IOException e) {
 			Log.e(e, "Cannot set ringtone");