diff -Naur --exclude='*.orig' psi-0.10-test1-orig/src/chatdlg.cpp psi-0.10-test1/src/chatdlg.cpp
--- psi-0.10-test1-orig/src/chatdlg.cpp	2005-08-29 23:16:21.000000000 +0000
+++ psi-0.10-test1/src/chatdlg.cpp	2005-08-29 23:26:38.000000000 +0000
@@ -202,7 +202,9 @@
 	// second row
 	QHBoxLayout *hb2 = new QHBoxLayout(vb2);
 	d->lb_status = new IconLabel(sp_top);
-	d->lb_status->setIcon(IconsetFactory::iconPtr("status/noauth"));
+	const Icon * icon = IconsetFactory::iconPtr("status/noauth"); 
+	d->lb_status->setIcon(icon); 
+	this->setIcon(icon->pixmap());
 	hb2->addWidget(d->lb_status);
 	d->le_jid = new QLineEdit(sp_top);
 	d->le_jid->setReadOnly(true);
@@ -571,10 +573,13 @@
 		}
 
 		if(statusChanged) {
+			const Icon * icon;
 			if(status == -1 || !u)
-				d->lb_status->setIcon(IconsetFactory::iconPtr("status/noauth"));
+				icon = IconsetFactory::iconPtr("status/noauth");
 			else
-				d->lb_status->setIcon(is->statusPtr(jid, status));
+				icon = is->statusPtr(jid, status);
+			d->lb_status->setIcon(icon); 
+			this->setIcon(icon->pixmap());
 		}
 
 		if(u)
@@ -701,10 +706,6 @@
 	d->act_pgp->setIcon( 0 );
 	d->act_pgp->setIconSet( i );
 
-	// update the widget icon
-#ifndef Q_WS_MAC
-	setIcon(IconsetFactory::icon("psi/start-chat"));
-#endif
 
 	/*QBrush brush;
 	brush.setPixmap( QPixmap( option.chatBgImage ) );