diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5efc5929c..79173267c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -44,7 +44,9 @@
             </intent-filter>
          </activity>
 
-        <activity android:name="org.linphone.UriPickerActivity" android:theme="@android:style/Theme.NoTitleBar">
+        <activity android:name="org.linphone.UriPickerActivity"
+        	android:theme="@android:style/Theme.NoTitleBar"
+        	android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
diff --git a/res/drawable/picker_plus.png b/res/drawable/picker_plus.png
new file mode 100644
index 000000000..e75c7c27c
Binary files /dev/null and b/res/drawable/picker_plus.png differ
diff --git a/res/drawable/picker_transfer.png b/res/drawable/picker_transfer.png
new file mode 100644
index 000000000..0251581f3
Binary files /dev/null and b/res/drawable/picker_transfer.png differ
diff --git a/res/layout/simplified_dialer.xml b/res/layout/simplified_dialer.xml
index 1ffee31fa..9c6632fcc 100644
--- a/res/layout/simplified_dialer.xml
+++ b/res/layout/simplified_dialer.xml
@@ -26,10 +26,11 @@
 	<LinearLayout android:gravity="bottom"
 		android:layout_height="wrap_content" android:layout_width="fill_parent">
 		<Button android:id="@+id/AddCallButton" android:text="@string/AddCallButtonText"
+			android:gravity="bottom|center_horizontal"
 			android:layout_height="fill_parent" android:layout_width="fill_parent"
 			android:layout_weight="1" android:background="@drawable/clavier_bg" />
 		<Button android:id="@+id/AddCallCancelButton" android:text="@string/CancelButtonText"
-			android:layout_height="fill_parent" android:layout_width="fill_parent"
+			android:layout_height="wrap_content" android:layout_width="fill_parent"
 			android:layout_weight="1" android:background="@drawable/clavier_bg" />
 	</LinearLayout>
 
diff --git a/src/org/linphone/UriPickerActivity.java b/src/org/linphone/UriPickerActivity.java
index dad28f6b3..cbe48fe77 100644
--- a/src/org/linphone/UriPickerActivity.java
+++ b/src/org/linphone/UriPickerActivity.java
@@ -115,11 +115,14 @@ public class UriPickerActivity extends TabActivity implements ContactPicked {
 			mAddress = (AddressText) findViewById(R.id.SipUri);
 
 			addButton = (Button) findViewById(R.id.AddCallButton);
+//			addButton.setCompoundDrawablePadding(100);
 			addButton.setOnClickListener(this);
 			String type = getIntent().getStringExtra(EXTRA_PICKER_TYPE);
 			if (EXTRA_PICKER_TYPE_ADD.equals(type)) {
+				addButton.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.picker_plus, 0, 0);
 				addButton.setText(getString(R.string.AddCallButtonText));
 			} else if (EXTRA_PICKER_TYPE_TRANSFER.equals(type)) {
+				addButton.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.picker_transfer, 0, 0);
 				addButton.setText(getString(R.string.TransferCallButtonText));
 			} else {
 				throw new RuntimeException("unknown type");