diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 2b07aaa98..a6d3ebee1 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -1094,7 +1094,7 @@ QSplitter:handle{
              <x>0</x>
              <y>0</y>
              <width>775</width>
-             <height>284</height>
+             <height>279</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_5"/>
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index 8898d4c45..0f92883e0 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -682,7 +682,7 @@ void Widget::setWindowTitle(const QString& title)
 
 void Widget::forceShow()
 {
-    hide();                     // Workaround to force minimized window to be restored
+    hide(); // Workaround to force minimized window to be restored
     show();
     activateWindow();
 }
@@ -785,6 +785,7 @@ void Widget::onSettingsClicked()
             settingsWidget->show(createContentDialog(SettingDialog));
 
         setActiveToolMenuButton(Widget::None);
+        settingsWidget->setWindowIcon(QIcon(":/img/icons/qtox.svg"));
     }
     else
     {
@@ -803,6 +804,7 @@ void Widget::showProfile() // onAvatarClicked, onUsernameClicked
             profileForm->show(createContentDialog(ProfileDialog));
 
         setActiveToolMenuButton(Widget::None);
+        settingsWidget->setWindowIcon(QIcon(":/img/icons/qtox.svg"));
     }
     else
     {
@@ -1368,6 +1370,7 @@ ContentLayout* Widget::createContentDialog(DialogType type)
         void retranslateUi()
         {
             setWindowTitle(Core::getInstance()->getUsername() + QStringLiteral(" - ") + Widget::fromDialogType(type));
+            setWindowIcon(QIcon(":/img/icons/qtox.svg"));
         }
 
     protected: