diff --git a/img/contact list icons/contact_dark.png b/img/contact list icons/contact_dark.png
new file mode 100644
index 000000000..be08811bc
Binary files /dev/null and b/img/contact list icons/contact_dark.png differ
diff --git a/widget/form/addfriendform.cpp b/widget/form/addfriendform.cpp
index 2c83c4a31..0f4701f45 100644
--- a/widget/form/addfriendform.cpp
+++ b/widget/form/addfriendform.cpp
@@ -40,6 +40,8 @@ void AddFriendForm::onSendTriggered()
     QString id = toxId.text(), msg = message.toPlainText();
     if (id.isEmpty())
         return;
+    if (message.isEmpty())
+        msg = "Tox me maybe?";
 
     emit friendRequested(id, msg);
 }
diff --git a/widget/friendwidget.cpp b/widget/friendwidget.cpp
index cf4fd81f0..567d96e78 100644
--- a/widget/friendwidget.cpp
+++ b/widget/friendwidget.cpp
@@ -76,6 +76,7 @@ void FriendWidget::setAsActiveChatroom()
     QPalette pal3;
     pal3.setColor(QPalette::Background, Qt::white);
     this->setPalette(pal3);
+    avatar.setPixmap(QPixmap("img/contact list icons/contact_dark.png"));
 }
 
 void FriendWidget::setAsInactiveChatroom()
@@ -92,4 +93,5 @@ void FriendWidget::setAsInactiveChatroom()
     QPalette pal3;
     pal3.setColor(QPalette::Background, QColor(63,63,63,255));
     this->setPalette(pal3);
+    avatar.setPixmap(QPixmap("img/contact list icons/contact.png"));
 }
diff --git a/widget/widget.cpp b/widget/widget.cpp
index 21dbc1fcc..49b308f00 100644
--- a/widget/widget.cpp
+++ b/widget/widget.cpp
@@ -173,13 +173,18 @@ void Widget::hideMainForms()
         item->widget()->hide();
     while ((item = ui->mainContent->layout()->takeAt(0)) != 0)
         item->widget()->hide();
+    
     if (activeFriendWidget != nullptr)
     {
-        activeFriendWidget->setAsInactiveChatroom();
+        Friend* f = FriendList::findFriend(activeFriendWidget->friendId);
+        if (f != nullptr)
+            activeFriendWidget->setAsInactiveChatroom();
     }
     if (activeGroupWidget != nullptr)
     {
-        activeGroupWidget->setAsInactiveChatroom();
+        Group* g = GroupList::findGroup(activeGroupWidget->groupId);
+        if (g != nullptr)
+            activeGroupWidget->setAsInactiveChatroom();
     }
 }