diff --git a/res/drawable-hdpi/options_transfer_default.png b/res/drawable-hdpi/options_transfer_default.png
index a2ec44285..409193c81 100644
Binary files a/res/drawable-hdpi/options_transfer_default.png and b/res/drawable-hdpi/options_transfer_default.png differ
diff --git a/res/drawable-hdpi/popup_black.png b/res/drawable-hdpi/popup_black.png
deleted file mode 100644
index 7fcece6ce..000000000
Binary files a/res/drawable-hdpi/popup_black.png and /dev/null differ
diff --git a/res/drawable-land-hdpi/micro_off_default.png b/res/drawable-land-hdpi/micro_off_default.png
index abb1dcef6..297071951 100644
Binary files a/res/drawable-land-hdpi/micro_off_default.png and b/res/drawable-land-hdpi/micro_off_default.png differ
diff --git a/res/drawable-land-hdpi/micro_off_disabled.png b/res/drawable-land-hdpi/micro_off_disabled.png
index fadfcbafa..ef133210a 100644
Binary files a/res/drawable-land-hdpi/micro_off_disabled.png and b/res/drawable-land-hdpi/micro_off_disabled.png differ
diff --git a/res/drawable-land-hdpi/micro_off_over.png b/res/drawable-land-hdpi/micro_off_over.png
index d19bfcad5..772d734fb 100644
Binary files a/res/drawable-land-hdpi/micro_off_over.png and b/res/drawable-land-hdpi/micro_off_over.png differ
diff --git a/res/drawable-land-hdpi/micro_on_default.png b/res/drawable-land-hdpi/micro_on_default.png
index 2a551232d..0f8be95ea 100644
Binary files a/res/drawable-land-hdpi/micro_on_default.png and b/res/drawable-land-hdpi/micro_on_default.png differ
diff --git a/res/drawable-land-hdpi/micro_on_disabled.png b/res/drawable-land-hdpi/micro_on_disabled.png
index d3632a238..9165841a8 100644
Binary files a/res/drawable-land-hdpi/micro_on_disabled.png and b/res/drawable-land-hdpi/micro_on_disabled.png differ
diff --git a/res/drawable-land-hdpi/micro_on_over.png b/res/drawable-land-hdpi/micro_on_over.png
index bafe54db7..8afa26cee 100644
Binary files a/res/drawable-land-hdpi/micro_on_over.png and b/res/drawable-land-hdpi/micro_on_over.png differ
diff --git a/res/drawable-land-hdpi/options_add_default.png b/res/drawable-land-hdpi/options_add_default.png
index 631683a08..f85f44628 100644
Binary files a/res/drawable-land-hdpi/options_add_default.png and b/res/drawable-land-hdpi/options_add_default.png differ
diff --git a/res/drawable-land-hdpi/options_add_disabled.png b/res/drawable-land-hdpi/options_add_disabled.png
index fd224437c..2b9997731 100644
Binary files a/res/drawable-land-hdpi/options_add_disabled.png and b/res/drawable-land-hdpi/options_add_disabled.png differ
diff --git a/res/drawable-land-hdpi/options_add_over.png b/res/drawable-land-hdpi/options_add_over.png
index f8ac1e90c..eddae5444 100644
Binary files a/res/drawable-land-hdpi/options_add_over.png and b/res/drawable-land-hdpi/options_add_over.png differ
diff --git a/res/drawable-land-hdpi/options_default.png b/res/drawable-land-hdpi/options_default.png
index 6f01edad6..e835f0829 100644
Binary files a/res/drawable-land-hdpi/options_default.png and b/res/drawable-land-hdpi/options_default.png differ
diff --git a/res/drawable-land-hdpi/options_disabled.png b/res/drawable-land-hdpi/options_disabled.png
index ff1b9f173..25bee610a 100644
Binary files a/res/drawable-land-hdpi/options_disabled.png and b/res/drawable-land-hdpi/options_disabled.png differ
diff --git a/res/drawable-land-hdpi/options_over.png b/res/drawable-land-hdpi/options_over.png
index c3dcd2190..dc2bb8404 100644
Binary files a/res/drawable-land-hdpi/options_over.png and b/res/drawable-land-hdpi/options_over.png differ
diff --git a/res/drawable-land-hdpi/options_selected.png b/res/drawable-land-hdpi/options_selected.png
index 6ff65ab37..4de39f880 100644
Binary files a/res/drawable-land-hdpi/options_selected.png and b/res/drawable-land-hdpi/options_selected.png differ
diff --git a/res/drawable-land-hdpi/options_transfer_default.png b/res/drawable-land-hdpi/options_transfer_default.png
index fc354333a..3c9ad5cb1 100644
Binary files a/res/drawable-land-hdpi/options_transfer_default.png and b/res/drawable-land-hdpi/options_transfer_default.png differ
diff --git a/res/drawable-land-hdpi/options_transfer_disabled.png b/res/drawable-land-hdpi/options_transfer_disabled.png
index 493486e0c..95fea9ef3 100644
Binary files a/res/drawable-land-hdpi/options_transfer_disabled.png and b/res/drawable-land-hdpi/options_transfer_disabled.png differ
diff --git a/res/drawable-land-hdpi/options_transfer_over.png b/res/drawable-land-hdpi/options_transfer_over.png
index 9b8f1c64c..4e13b8a6a 100644
Binary files a/res/drawable-land-hdpi/options_transfer_over.png and b/res/drawable-land-hdpi/options_transfer_over.png differ
diff --git a/res/drawable-land-hdpi/speaker_off_default.png b/res/drawable-land-hdpi/speaker_off_default.png
index b77b4ef25..a8c06fa29 100644
Binary files a/res/drawable-land-hdpi/speaker_off_default.png and b/res/drawable-land-hdpi/speaker_off_default.png differ
diff --git a/res/drawable-land-hdpi/speaker_off_disabled.png b/res/drawable-land-hdpi/speaker_off_disabled.png
index 4c844e33f..71e614e16 100644
Binary files a/res/drawable-land-hdpi/speaker_off_disabled.png and b/res/drawable-land-hdpi/speaker_off_disabled.png differ
diff --git a/res/drawable-land-hdpi/speaker_off_over.png b/res/drawable-land-hdpi/speaker_off_over.png
index 4049e7b75..66d3c8992 100644
Binary files a/res/drawable-land-hdpi/speaker_off_over.png and b/res/drawable-land-hdpi/speaker_off_over.png differ
diff --git a/res/drawable-land-hdpi/speaker_on_default.png b/res/drawable-land-hdpi/speaker_on_default.png
index 90f75c124..5f9ffbbb1 100644
Binary files a/res/drawable-land-hdpi/speaker_on_default.png and b/res/drawable-land-hdpi/speaker_on_default.png differ
diff --git a/res/drawable-land-hdpi/speaker_on_disabled.png b/res/drawable-land-hdpi/speaker_on_disabled.png
index 1235ab82b..7a8c6023a 100644
Binary files a/res/drawable-land-hdpi/speaker_on_disabled.png and b/res/drawable-land-hdpi/speaker_on_disabled.png differ
diff --git a/res/drawable-land-hdpi/speaker_on_over.png b/res/drawable-land-hdpi/speaker_on_over.png
index e3ff2f8fd..db44d5a07 100644
Binary files a/res/drawable-land-hdpi/speaker_on_over.png and b/res/drawable-land-hdpi/speaker_on_over.png differ
diff --git a/res/drawable-land-hdpi/video_off_default.png b/res/drawable-land-hdpi/video_off_default.png
index 037a41397..bdf806f04 100644
Binary files a/res/drawable-land-hdpi/video_off_default.png and b/res/drawable-land-hdpi/video_off_default.png differ
diff --git a/res/drawable-land-hdpi/video_off_disabled.png b/res/drawable-land-hdpi/video_off_disabled.png
index 80cc968b9..bba655b46 100644
Binary files a/res/drawable-land-hdpi/video_off_disabled.png and b/res/drawable-land-hdpi/video_off_disabled.png differ
diff --git a/res/drawable-land-hdpi/video_off_over.png b/res/drawable-land-hdpi/video_off_over.png
index afdbe9e4e..f93047c62 100644
Binary files a/res/drawable-land-hdpi/video_off_over.png and b/res/drawable-land-hdpi/video_off_over.png differ
diff --git a/res/drawable-land-hdpi/video_on_default.png b/res/drawable-land-hdpi/video_on_default.png
index 46a88e074..3ca9fabdf 100644
Binary files a/res/drawable-land-hdpi/video_on_default.png and b/res/drawable-land-hdpi/video_on_default.png differ
diff --git a/res/drawable-land-hdpi/video_on_disabled.png b/res/drawable-land-hdpi/video_on_disabled.png
index 3074faae3..f122718f0 100644
Binary files a/res/drawable-land-hdpi/video_on_disabled.png and b/res/drawable-land-hdpi/video_on_disabled.png differ
diff --git a/res/drawable-land-hdpi/video_on_over.png b/res/drawable-land-hdpi/video_on_over.png
index 665973f26..252f88441 100644
Binary files a/res/drawable-land-hdpi/video_on_over.png and b/res/drawable-land-hdpi/video_on_over.png differ
diff --git a/res/drawable/popup.9.png b/res/drawable/popup.9.png
new file mode 100644
index 000000000..212f1e4aa
Binary files /dev/null and b/res/drawable/popup.9.png differ
diff --git a/res/layout/toast.xml b/res/layout/toast.xml
index dc3437b8e..4ae7ccfa5 100644
--- a/res/layout/toast.xml
+++ b/res/layout/toast.xml
@@ -3,20 +3,15 @@
 	android:id="@+id/toastRoot"
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
-	android:background="@drawable/zrtp_popup"
+	android:background="@drawable/popup"
 	android:orientation="vertical" >
-
-	<TextView
-		android:id="@+id/toastTitle"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:textAppearance="?android:attr/textAppearanceLarge" />
 	
 	<TextView
 		android:id="@+id/toastMessage"
-		android:textColor="@android:color/black"
-		android:layout_marginTop="5dp"
+		android:textColor="@android:color/white"
+		android:padding="5dp"
 		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" />
+		android:layout_height="wrap_content"
+	    android:textAppearance="?android:attr/textAppearanceMedium" />
 
 </LinearLayout>
diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index 0f244dca1..a1b69066d 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -132,10 +132,16 @@ public class IncomingCallActivity extends Activity implements LinphoneOnCallStat
 			// the above method takes care of Samsung Galaxy S
 			Toast.makeText(this, R.string.couldnt_accept_call, Toast.LENGTH_LONG).show();
 		} else {
-			if (mCall.getCurrentParamsCopy().getVideoEnabled())
+			if (!LinphoneActivity.isInstanciated()) {
+				return;
+			}
+			
+			if (mCall.getCurrentParamsCopy().getVideoEnabled()) {
 				LinphoneActivity.instance().startVideoActivity(mCall);
-			else
+			}
+			else {
 				LinphoneActivity.instance().startIncallActivity(mCall);
+			}
 		}
 	}
 
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index ba8e33c66..73a1f9878 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -691,7 +691,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
 	@Override
 	public void onCallStateChanged(LinphoneCall call, State state, String message) {
 		if (state == State.Error) {
-			displayCustomToast(null, message, Toast.LENGTH_LONG);
+			displayCustomToast(message, Toast.LENGTH_LONG);
 		}
 		
 		if (state == State.IncomingReceived) {
@@ -710,20 +710,13 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
 		displayMissedCalls(missedCalls);
 	}
 	
-	private void displayCustomToast(final String title, final String message, final int duration) {
+	private void displayCustomToast(final String message, final int duration) {
 		mHandler.post(new Runnable() {
 			@Override
 			public void run() {
 				LayoutInflater inflater = getLayoutInflater();
 				View layout = inflater.inflate(R.layout.toast, (ViewGroup) findViewById(R.id.toastRoot));
 
-				TextView toastTitle = (TextView) layout.findViewById(R.id.toastTitle);
-				if (title == null) {
-					toastTitle.setVisibility(View.GONE);
-				} else {
-					toastTitle.setText(title);
-				}
-				
 				TextView toastText = (TextView) layout.findViewById(R.id.toastMessage);
 				toastText.setText(message);