diff --git a/src/ChatPage.cc b/src/ChatPage.cc
index db755f4fa5f507358c8cd0081ea7d4bb2b13310e..db911972f5870e28a0b6b56b1821c5432f0de32e 100644
--- a/src/ChatPage.cc
+++ b/src/ChatPage.cc
@@ -212,12 +212,10 @@ void ChatPage::changeTopRoomInfo(const RoomInfo &info)
 	top_bar_->updateRoomName(info.name());
 	top_bar_->updateRoomTopic(info.topic());
 
-	if (room_avatars_.contains(info.id())) {
-		QIcon icon(room_avatars_.value(info.id()));
-		top_bar_->updateRoomAvatar(icon);
-	} else {
+	if (room_avatars_.contains(info.id()))
+		top_bar_->updateRoomAvatar(room_avatars_.value(info.id()).toImage());
+	else
 		top_bar_->updateRoomAvatarFromName(info.name());
-	}
 
 	current_room_ = info;
 }
diff --git a/src/RoomInfoListItem.cc b/src/RoomInfoListItem.cc
index f803ce2ee7c2bfef963f22190f9a0015a0b01d16..12179567fd757b8dd826b3e3e2e09867d1708559 100644
--- a/src/RoomInfoListItem.cc
+++ b/src/RoomInfoListItem.cc
@@ -29,8 +29,7 @@ RoomInfoListItem::RoomInfoListItem(RoomInfo info, QWidget *parent)
     , max_height_(60)
 {
 	normal_style_ =
-		"QWidget { background-color: #5d6565; color: #ebebeb;"
-		"border-bottom: 1px solid #171919;}"
+		"QWidget { color: #ebebeb; background-color: #232626; border-bottom: 1px solid #171919;}"
 		"QLabel { border: none; }";
 
 	pressed_style_ =
diff --git a/src/TopRoomBar.cc b/src/TopRoomBar.cc
index adff71b098858ed6473158dfca086e647817d64b..9e30c4992e75ac41e18895b3cd3c9b5102420a63 100644
--- a/src/TopRoomBar.cc
+++ b/src/TopRoomBar.cc
@@ -23,8 +23,8 @@ TopRoomBar::TopRoomBar(QWidget *parent)
     : QWidget(parent)
 {
 	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-	setMinimumSize(QSize(0, 70));
-	setStyleSheet("background-color: #171919; color: #ebebeb;");
+	setMinimumSize(QSize(0, 65));
+	setStyleSheet("background-color: #232626; color: #ebebeb;");
 
 	top_layout_ = new QHBoxLayout();
 	top_layout_->setSpacing(10);
@@ -33,17 +33,17 @@ TopRoomBar::TopRoomBar(QWidget *parent)
 	avatar_ = new Avatar(this);
 	avatar_->setLetter(QChar('?'));
 	avatar_->setBackgroundColor(QColor("#ebebeb"));
-	avatar_->setSize(45);
+	avatar_->setSize(35);
 
 	text_layout_ = new QVBoxLayout();
 	text_layout_->setSpacing(0);
 	text_layout_->setContentsMargins(0, 0, 0, 0);
 
 	name_label_ = new QLabel(this);
-	name_label_->setStyleSheet("font-size: 11pt;");
+	name_label_->setStyleSheet("font-size: 14px; font-weight: 600;");
 
 	topic_label_ = new QLabel(this);
-	topic_label_->setStyleSheet("font-size: 10pt; color: #6c7278;");
+	topic_label_->setStyleSheet("font-size: 12px;");
 
 	text_layout_->addWidget(name_label_);
 	text_layout_->addWidget(topic_label_);