diff --git a/res/drawable-land/options_add_default.png b/res/drawable-land/options_add_default.png
index fc32af577..631683a08 100644
Binary files a/res/drawable-land/options_add_default.png and b/res/drawable-land/options_add_default.png differ
diff --git a/res/drawable-land/options_add_default_alt.png b/res/drawable-land/options_add_default_alt.png
index 88197f7f3..2c5af470b 100644
Binary files a/res/drawable-land/options_add_default_alt.png and b/res/drawable-land/options_add_default_alt.png differ
diff --git a/res/drawable-land/options_add_disabled.png b/res/drawable-land/options_add_disabled.png
index c5d86a2dc..fd224437c 100644
Binary files a/res/drawable-land/options_add_disabled.png and b/res/drawable-land/options_add_disabled.png differ
diff --git a/res/drawable-land/options_add_disabled_alt.png b/res/drawable-land/options_add_disabled_alt.png
index 2e71beb77..883fd3cca 100644
Binary files a/res/drawable-land/options_add_disabled_alt.png and b/res/drawable-land/options_add_disabled_alt.png differ
diff --git a/res/drawable-land/options_add_over.png b/res/drawable-land/options_add_over.png
index fdd0844ba..f8ac1e90c 100644
Binary files a/res/drawable-land/options_add_over.png and b/res/drawable-land/options_add_over.png differ
diff --git a/res/drawable-land/options_add_over_alt.png b/res/drawable-land/options_add_over_alt.png
index a6172a37d..df7f46b05 100644
Binary files a/res/drawable-land/options_add_over_alt.png and b/res/drawable-land/options_add_over_alt.png differ
diff --git a/res/drawable-land/options_default.png b/res/drawable-land/options_default.png
index 50b2331ca..6f01edad6 100644
Binary files a/res/drawable-land/options_default.png and b/res/drawable-land/options_default.png differ
diff --git a/res/drawable-land/options_default_alt.png b/res/drawable-land/options_default_alt.png
index a6772d9aa..7399bb1ef 100644
Binary files a/res/drawable-land/options_default_alt.png and b/res/drawable-land/options_default_alt.png differ
diff --git a/res/drawable-land/options_disabled.png b/res/drawable-land/options_disabled.png
index feae57610..ff1b9f173 100644
Binary files a/res/drawable-land/options_disabled.png and b/res/drawable-land/options_disabled.png differ
diff --git a/res/drawable-land/options_disabled_alt.png b/res/drawable-land/options_disabled_alt.png
index e07a3e04a..2bd1f4dc4 100644
Binary files a/res/drawable-land/options_disabled_alt.png and b/res/drawable-land/options_disabled_alt.png differ
diff --git a/res/drawable-land/options_over.png b/res/drawable-land/options_over.png
index a8a792571..c3dcd2190 100644
Binary files a/res/drawable-land/options_over.png and b/res/drawable-land/options_over.png differ
diff --git a/res/drawable-land/options_over_alt.png b/res/drawable-land/options_over_alt.png
index c45d47efe..019cfa576 100644
Binary files a/res/drawable-land/options_over_alt.png and b/res/drawable-land/options_over_alt.png differ
diff --git a/res/drawable-land/options_selected.png b/res/drawable-land/options_selected.png
index 79646f265..6ff65ab37 100644
Binary files a/res/drawable-land/options_selected.png and b/res/drawable-land/options_selected.png differ
diff --git a/res/drawable-land/options_selected_alt.png b/res/drawable-land/options_selected_alt.png
index 9d9f86154..883a6f828 100644
Binary files a/res/drawable-land/options_selected_alt.png and b/res/drawable-land/options_selected_alt.png differ
diff --git a/res/layout-land/incall.xml b/res/layout-land/incall.xml
index 5ceff7bfb..d33e494aa 100644
--- a/res/layout-land/incall.xml
+++ b/res/layout-land/incall.xml
@@ -44,7 +44,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="100dp"
+            android:layout_height="70dp"
             android:layout_weight="1"
             android:orientation="horizontal" >
 
@@ -96,7 +96,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="100dp"
+            android:layout_height="70dp"
             android:layout_weight="1"
             android:orientation="horizontal" >
 
diff --git a/res/layout/incoming.xml b/res/layout/incoming.xml
index 482ef286b..9daa36fd4 100644
--- a/res/layout/incoming.xml
+++ b/res/layout/incoming.xml
@@ -21,12 +21,13 @@
 		    android:textColor="@android:color/white"
 		    android:textSize="22dp" />
 	
-		<LinearLayout 
+		<LinearLayout
 		    android:layout_width="match_parent"
-			android:layout_height="match_parent" 
+		    android:layout_height="match_parent"
 		    android:layout_weight="0.1"
-			android:orientation="vertical"
-			android:paddingTop="30dip">
+		    android:gravity="center_horizontal"
+		    android:orientation="vertical"
+		    android:paddingTop="30dip" >
 			
 		    <org.linphone.ui.AvatarWithShadow
 			    android:id="@+id/incoming_picture"
diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java
index 6f4aaa411..d233acb6a 100644
--- a/src/org/linphone/InCallActivity.java
+++ b/src/org/linphone/InCallActivity.java
@@ -61,7 +61,7 @@ public class InCallActivity extends FragmentActivity implements
 	private StatusFragment status;
 	private AudioCallFragment audioCallFragment;
 	private VideoCallFragment videoCallFragment;
-	private boolean isSpeakerEnabled = false, isMicMuted = false, isVideoEnabled;
+	private boolean isSpeakerEnabled = false, isMicMuted = false, isVideoEnabled, isTransferAllowed;
 	private LinearLayout mControlsLayout;
 	
 	@Override
@@ -70,6 +70,7 @@ public class InCallActivity extends FragmentActivity implements
         setContentView(R.layout.incall);
         
         isVideoEnabled = getIntent().getExtras() != null && getIntent().getExtras().getBoolean("VideoEnabled");
+        isTransferAllowed = getResources().getBoolean(R.bool.allow_transfers);
         
         if (findViewById(R.id.fragmentContainer) != null) {
             initUI();
@@ -135,6 +136,10 @@ public class InCallActivity extends FragmentActivity implements
         switchCamera.setOnClickListener(this);
 		
 		mControlsLayout = (LinearLayout) findViewById(R.id.menu);
+		
+        if (!isTransferAllowed) {
+        	addCall.setImageResource(R.drawable.options_add_call);
+        }
 	}
 	
 	private void enableAndRefreshInCallActions() {
@@ -426,7 +431,9 @@ public class InCallActivity extends FragmentActivity implements
 		if (addCall.getVisibility() == View.VISIBLE) {
 			options.setImageResource(R.drawable.options);
 			if (getResources().getBoolean(R.bool.disable_animations)) {
-				transfer.setVisibility(View.GONE);
+				if (isTransferAllowed) {
+					transfer.setVisibility(View.GONE);
+				}
 				addCall.setVisibility(View.GONE);
 			} else {
 				Animation anim = AnimationUtils.loadAnimation(this, R.anim.slide_out_left_to_right);
@@ -443,16 +450,22 @@ public class InCallActivity extends FragmentActivity implements
 					
 					@Override
 					public void onAnimationEnd(Animation animation) {
-						transfer.setVisibility(View.GONE);
+						if (isTransferAllowed) {
+							transfer.setVisibility(View.GONE);
+						}
 						addCall.setVisibility(View.GONE);
 					}
 				});
-				transfer.startAnimation(anim);
+				if (isTransferAllowed) {
+					transfer.startAnimation(anim);
+				}
 				addCall.startAnimation(anim);
 			}
 		} else {		
 			if (getResources().getBoolean(R.bool.disable_animations)) {
-				transfer.setVisibility(View.VISIBLE);
+				if (isTransferAllowed) {
+					transfer.setVisibility(View.VISIBLE);
+				}
 				addCall.setVisibility(View.VISIBLE);
 				options.setImageResource(R.drawable.options_alt);
 			} else {
@@ -471,11 +484,15 @@ public class InCallActivity extends FragmentActivity implements
 					@Override
 					public void onAnimationEnd(Animation animation) {
 						options.setImageResource(R.drawable.options_alt);
-						transfer.setVisibility(View.VISIBLE);
+						if (isTransferAllowed) {
+							transfer.setVisibility(View.VISIBLE);
+						}
 						addCall.setVisibility(View.VISIBLE);
 					}
 				});
-				transfer.startAnimation(anim);
+				if (isTransferAllowed) {
+					transfer.startAnimation(anim);
+				}
 				addCall.startAnimation(anim);
 			}
 		}
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index fbc0ceb43..adf7f4c6c 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -616,7 +616,9 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
 			@Override
 			public void run() {
 				isInCallLayout = false;
-				((DialerFragment) dialerFragment).resetLayout();
+				if (dialerFragment != null) {
+					((DialerFragment) dialerFragment).resetLayout();
+				}
 				
 				if (LinphoneManager.getLc().getCallsNb() > 0) {
 					LinphoneCall call = LinphoneManager.getLc().getCalls()[0];