diff --git a/res/layout-xlarge-land/main.xml b/res/layout-xlarge-land/main.xml
index f382317d9..974d2ab25 100644
--- a/res/layout-xlarge-land/main.xml
+++ b/res/layout-xlarge-land/main.xml
@@ -42,7 +42,7 @@
     <LinearLayout
         android:id="@+id/menu"
         android:layout_width="match_parent"
-        android:layout_height="90dp"
+        android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:orientation="horizontal" >
 
@@ -55,6 +55,7 @@
                 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" />
@@ -74,8 +75,9 @@
         <ImageView
             android:id="@+id/contacts"
             android:layout_width="match_parent"
-            android:layout_height="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" />
@@ -83,9 +85,9 @@
         <ImageView
             android:id="@+id/dialer"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="0.25"
-            android:adjustViewBounds="true"
+			android:adjustViewBounds="true"
             android:contentDescription="@string/content_description_dialer"
             android:scaleType="fitEnd"
             android:src="@drawable/dialer" />
@@ -93,8 +95,9 @@
         <ImageView
             android:id="@+id/settings"
             android:layout_width="match_parent"
-            android:layout_height="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" />
@@ -107,8 +110,8 @@
             <ImageView
                 android:id="@+id/chat"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
+                android:layout_height="wrap_content"
+				android:adjustViewBounds="true"
                 android:contentDescription="@string/content_description_chat"
                 android:scaleType="fitXY"
                 android:src="@drawable/chat" />
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 8e6709647..eacf13737 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -29,7 +29,7 @@
     <LinearLayout
         android:id="@+id/menu"
         android:layout_width="match_parent"
-        android:layout_height="90dp"
+        android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:orientation="horizontal">
 
@@ -42,6 +42,7 @@
                 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" />
@@ -61,8 +62,9 @@
         <ImageView
             android:id="@+id/contacts"
             android:layout_width="match_parent"
-            android:layout_height="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" />
@@ -72,6 +74,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="0.2"
+			android:adjustViewBounds="true"
             android:contentDescription="@string/content_description_dialer"
             android:scaleType="fitXY"
             android:src="@drawable/dialer" />
@@ -79,8 +82,9 @@
         <ImageView
             android:id="@+id/settings"
             android:layout_width="match_parent"
-            android:layout_height="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" />
@@ -93,8 +97,8 @@
             <ImageView
                 android:id="@+id/chat"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
+                android:layout_height="wrap_content"
+				android:adjustViewBounds="true"
                 android:contentDescription="@string/content_description_chat"
                 android:scaleType="fitXY"
                 android:src="@drawable/chat" />
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 5423534ac..0ab814e38 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -629,6 +629,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
 	public void startIncallActivity(LinphoneCall currentCall) {
 		Intent intent = new Intent(this, InCallActivity.class);
 		intent.putExtra("VideoEnabled", false);
+		startOrientationSensor();
 		startActivityForResult(intent, callActivity);
 	}