diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index c598ccc75..452edb7a9 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -119,6 +119,10 @@ void Widget::init()
 {
     ui->setupUi(this);
 
+    QIcon themeIcon = QIcon::fromTheme("qtox");
+    if (!themeIcon.isNull())
+        setWindowIcon(themeIcon);
+
     timer = new QTimer();
     timer->start(1000);
     offlineMsgTimer = new QTimer();
@@ -427,7 +431,7 @@ void Widget::updateIcons()
             status = QStringLiteral("offline");
     }
 
-    QIcon ico;
+    QIcon ico = QIcon::fromTheme("qtox-" + status);
     if (ico.isNull())
     {
         QString color = Settings::getInstance().getLightTrayIcon() ? "light" : "dark";