--- a/AndroidManifest.xml	Thu Oct 15 17:36:51 2009 +0200
+++ b/AndroidManifest.xml	Fri Oct 23 16:24:42 2009 +0200
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.beem.project.beem" android:versionCode="1"
 	android:versionName="1.0">
-	<application android:label="@string/app_name" android:icon="@drawable/signal"
+	<application android:label="@string/app_name" android:icon="@drawable/beem_launcher_icon_silver"
 		android:theme="@style/Theme.BEEM.Default" android:debuggable="true">
 		<activity android:name=".ui.Login" android:label="@string/app_name"
 			android:launchMode="singleTask">

Binary file res/drawable/beem_launcher_icon_color.png has changed

Binary file res/drawable/beem_launcher_icon_silver.png has changed

Binary file res/drawable/beem_status_icon.png has changed

--- a/src/com/beem/project/beem/service/BeemChatManager.java	Thu Oct 15 17:36:51 2009 +0200
+++ b/src/com/beem/project/beem/service/BeemChatManager.java	Fri Oct 23 16:24:42 2009 +0200
@@ -74,7 +74,7 @@
 	private void notifyNewChat(IChat chat) {
 	    try {
 		String text = chat.getParticipant().getJID();
-		Notification notif = new Notification(com.beem.project.beem.R.drawable.notify_message, text, System
+		Notification notif = new Notification(android.R.drawable.stat_notify_chat, text, System
 		    .currentTimeMillis());
 		notif.defaults = Notification.DEFAULT_ALL;
 		notif.flags = Notification.FLAG_AUTO_CANCEL;

--- a/src/com/beem/project/beem/service/XmppFacade.java	Thu Oct 15 17:36:51 2009 +0200
+++ b/src/com/beem/project/beem/service/XmppFacade.java	Fri Oct 23 16:24:42 2009 +0200
@@ -58,7 +58,7 @@
 	String text = "";
 	if (msg != null)
 	    text = msg;
-	mStatusNotification = new Notification(com.beem.project.beem.R.drawable.notify_signal, text, System
+	mStatusNotification = new Notification(com.beem.project.beem.R.drawable.beem_status_icon, text, System
 	    .currentTimeMillis());
 	mStatusNotification.defaults = Notification.DEFAULT_ALL;
 	mStatusNotification.flags = Notification.FLAG_NO_CLEAR;

--- a/src/com/beem/project/beem/ui/SendIM.java	Thu Oct 15 17:36:51 2009 +0200
+++ b/src/com/beem/project/beem/ui/SendIM.java	Fri Oct 23 16:24:42 2009 +0200
@@ -320,7 +320,7 @@
 			if (contactName == null || "".equals(contactName)) {
 			    contactName = mContact.getJID();
 			    contactName = StringUtils.parseName(contactName);
-			    if ("".equals(contactName))
+			    if (contactName == null || "".equals(contactName))
 				contactName = mContact.getJID();
 			}
 			mLogin.setText(contactName);
@@ -473,7 +473,6 @@
 	    if (mContact.getJID().equals(StringUtils.parseBareAddress(presence.getFrom()))) {
 		mContact.setStatus(mRoster.getPresence(StringUtils.parseBareAddress(presence.getFrom())));
 		Log.d("SENDIM -- onPresenceChanged", "Contact current status: " + mContact.getStatus() + "");
-		updateStatusIcon();
 		mHandler.post(new RunnableChange());
 	    }
 	}
@@ -491,6 +490,7 @@
 
 	    @Override
 	    public void run() {
+		updateStatusIcon();
 		mStatusText.setText(mContact.getMsgState());
 		Linkify.addLinks(mStatusText, Linkify.WEB_URLS);
 	    }