diff --git a/src/widgets/room/autotests/roomheaderwidgettest.cpp b/src/widgets/room/autotests/roomheaderwidgettest.cpp
index 6f581223..4382cc0c 100644
--- a/src/widgets/room/autotests/roomheaderwidgettest.cpp
+++ b/src/widgets/room/autotests/roomheaderwidgettest.cpp
@@ -1,58 +1,64 @@
 /*
    Copyright (c) 2020 Laurent Montel <montel@kde.org>
 
    This library is free software; you can redistribute it and/or modify
    it under the terms of the GNU Library General Public License as published
    by the Free Software Foundation; either version 2 of the License or
    ( at your option ) version 3 or, at the discretion of KDE e.V.
    ( which shall act as a proxy as in section 14 of the GPLv3 ), any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #include "roomheaderwidgettest.h"
 #include "room/roomheaderwidget.h"
 #include <QLabel>
 #include <QTest>
+#include <QToolButton>
 #include <QVBoxLayout>
 QTEST_MAIN(RoomHeaderWidgetTest)
 RoomHeaderWidgetTest::RoomHeaderWidgetTest(QObject *parent)
     : QObject(parent)
 {
 }
 
 void RoomHeaderWidgetTest::shouldHaveDefaultValues()
 {
     RoomHeaderWidget w;
     QVBoxLayout *mainLayout = w.findChild<QVBoxLayout *>(QStringLiteral("mainLayout"));
     QVERIFY(mainLayout);
     QCOMPARE(mainLayout->contentsMargins(), QMargins(0, 0, 0, 0));
 
     QLabel *mRoomName = w.findChild<QLabel *>(QStringLiteral("mRoomName"));
     QVERIFY(mRoomName);
     QVERIFY(mRoomName->text().isEmpty());
     QVERIFY(!mRoomName->isVisible());
 
     QLabel *mTopic = w.findChild<QLabel *>(QStringLiteral("mTopic"));
     QVERIFY(mTopic);
     QVERIFY(mTopic->text().isEmpty());
     QVERIFY(!mTopic->isVisible());
 
     QLabel *mAnnouncement = w.findChild<QLabel *>(QStringLiteral("mAnnouncement"));
     QVERIFY(mAnnouncement);
     QVERIFY(mAnnouncement->text().isEmpty());
     QVERIFY(!mAnnouncement->isVisible());
 
     QLabel *mDescription = w.findChild<QLabel *>(QStringLiteral("mDescription"));
     QVERIFY(mDescription);
     QVERIFY(mDescription->text().isEmpty());
     QVERIFY(!mDescription->isVisible());
+
+    QToolButton *mFavoriteButton = w.findChild<QToolButton *>(QStringLiteral("mFavoriteButton"));
+    QVERIFY(mFavoriteButton);
+    QVERIFY(mFavoriteButton->isCheckable());
+    QVERIFY(!mFavoriteButton->isVisible());
 }
diff --git a/src/widgets/room/roomheaderwidget.cpp b/src/widgets/room/roomheaderwidget.cpp
index db4a8874..69babdc6 100644
--- a/src/widgets/room/roomheaderwidget.cpp
+++ b/src/widgets/room/roomheaderwidget.cpp
@@ -1,105 +1,107 @@
 /*
    Copyright (c) 2020 Laurent Montel <montel@kde.org>
 
    This library is free software; you can redistribute it and/or modify
    it under the terms of the GNU Library General Public License as published
    by the Free Software Foundation; either version 2 of the License or
    ( at your option ) version 3 or, at the discretion of KDE e.V.
    ( which shall act as a proxy as in section 14 of the GPLv3 ), any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #include "roomheaderwidget.h"
 #include <QVBoxLayout>
 #include <KLocalizedString>
 #include <QLabel>
 #include <QToolButton>
 
 RoomHeaderWidget::RoomHeaderWidget(QWidget *parent)
     : QWidget(parent)
 {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainLayout"));
     mainLayout->setContentsMargins(0, 0, 0, 0);
 
     QHBoxLayout *headerLayout = new QHBoxLayout;
     headerLayout->setObjectName(QStringLiteral("headerLayout"));
     headerLayout->setContentsMargins(0, 0, 0, 0);
     mainLayout->addLayout(headerLayout);
 
     mFavoriteButton = new QToolButton(this);
     mFavoriteButton->setObjectName(QStringLiteral("mFavoriteButton"));
     mFavoriteButton->setIcon(QIcon::fromTheme(QStringLiteral("favorite")));
     mFavoriteButton->setCheckable(true);
+    mFavoriteButton->setVisible(false);
     headerLayout->addWidget(mFavoriteButton, Qt::AlignTop);
     connect(mFavoriteButton, &QToolButton::clicked, this, &RoomHeaderWidget::favoriteChanged);
 
     QVBoxLayout *infoLayout = new QVBoxLayout(this);
     infoLayout->setObjectName(QStringLiteral("infoLayout"));
     infoLayout->setContentsMargins(0, 0, 0, 0);
     headerLayout->addLayout(infoLayout);
 
     mRoomName = new QLabel(this);
     mRoomName->setObjectName(QStringLiteral("mRoomName"));
     infoLayout->addWidget(mRoomName);
     mRoomName->setVisible(false);
 
     mTopic = new QLabel(this);
     mTopic->setObjectName(QStringLiteral("mTopic"));
     infoLayout->addWidget(mTopic);
     mTopic->setOpenExternalLinks(true);
     mTopic->setVisible(false);
 
     mAnnouncement = new QLabel(this);
     mAnnouncement->setObjectName(QStringLiteral("mAnnouncement"));
     infoLayout->addWidget(mAnnouncement);
     mAnnouncement->setOpenExternalLinks(true);
     mAnnouncement->setVisible(false);
 
     mDescription = new QLabel(this);
     mDescription->setObjectName(QStringLiteral("mDescription"));
     infoLayout->addWidget(mDescription);
     mDescription->setOpenExternalLinks(true);
     mDescription->setVisible(false);
 }
 
 RoomHeaderWidget::~RoomHeaderWidget()
 {
 }
 
 void RoomHeaderWidget::setRoomName(const QString &name)
 {
     mRoomName->setText(name);
     mRoomName->setVisible(!name.isEmpty());
 }
 
 QString RoomHeaderWidget::roomName() const
 {
     return mRoomName->text();
 }
 
 void RoomHeaderWidget::setRoomAnnouncement(const QString &name)
 {
     mAnnouncement->setText(name);
     mAnnouncement->setVisible(!name.isEmpty());
 }
 
 void RoomHeaderWidget::setRoomTopic(const QString &name)
 {
     mTopic->setText(name);
     mTopic->setVisible(!name.isEmpty());
 }
 
 void RoomHeaderWidget::setFavoriteStatus(bool b)
 {
     mFavoriteButton->setChecked(b);
+    mFavoriteButton->setVisible(true); //TODO optimize it.
 }