diff --git a/resources/images/icon.png b/resources/images/icon.png
new file mode 100644
index 000000000..9a6f5ba19
Binary files /dev/null and b/resources/images/icon.png differ
diff --git a/resources/resources.qrc b/resources/resources.qrc
index fa74b9f4b..9e7b48f8f 100644
--- a/resources/resources.qrc
+++ b/resources/resources.qrc
@@ -40,6 +40,7 @@
         <file>images/theme.svg</file>
         <file>images/accounts.svg</file>
         <file>images/chatterino2.icns</file>
+        <file>images/icon.png</file>
     </qresource>
     <qresource prefix="/qt/etc">
         <file>qt.conf</file>
diff --git a/src/widgets/basewidget.cpp b/src/widgets/basewidget.cpp
index 40f824363..6ed7535f2 100644
--- a/src/widgets/basewidget.cpp
+++ b/src/widgets/basewidget.cpp
@@ -4,6 +4,7 @@
 #include "widgets/tooltipwidget.hpp"
 
 #include <QDebug>
+#include <QIcon>
 #include <QLayout>
 #include <QtGlobal>
 #include <boost/signals2.hpp>
@@ -62,6 +63,8 @@ void BaseWidget::init()
 
 void BaseWidget::initAsWindow()
 {
+    this->setWindowIcon(QIcon(":/images/icon.png"));
+
     this->isWindow = true;
 
 #ifdef USEWINSDK