diff --git a/qt-ui/divelogexportdialog.ui b/qt-ui/divelogexportdialog.ui
index f48877f12..aeed08895 100644
--- a/qt-ui/divelogexportdialog.ui
+++ b/qt-ui/divelogexportdialog.ui
@@ -13,6 +13,11 @@
   <property name="windowTitle">
    <string>Export dive log files</string>
   </property>
+  <property name="windowIcon">
+   <iconset>
+    <normalon>:/subsurface-icon</normalon>
+   </iconset>
+  </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QTabWidget" name="tabWidget">
diff --git a/qt-ui/updatemanager.cpp b/qt-ui/updatemanager.cpp
index b790a6104..f92eeb873 100644
--- a/qt-ui/updatemanager.cpp
+++ b/qt-ui/updatemanager.cpp
@@ -60,6 +60,7 @@ void UpdateManager::requestReceived()
 	}
 
 	msgbox.setWindowTitle(msgTitle);
+	msgbox.setWindowIcon(QIcon(":/subsurface-icon"));
 	msgbox.setText(msgText);
 	msgbox.setTextFormat(Qt::RichText);
 	msgbox.exec();
diff --git a/qt-ui/usermanual.cpp b/qt-ui/usermanual.cpp
index b878f22ca..b6e6f09d6 100644
--- a/qt-ui/usermanual.cpp
+++ b/qt-ui/usermanual.cpp
@@ -53,6 +53,8 @@ UserManual::UserManual(QWidget *parent) : QWidget(parent)
 	addAction(actionHideSearch);
 
 	setWindowTitle(tr("User Manual"));
+	setWindowIcon(QIcon(":/subsurface-icon"));
+
 
 	userManual = new QWebView(this);
 	userManual->page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
diff --git a/qt-ui/usersurvey.cpp b/qt-ui/usersurvey.cpp
index 24e2070e0..8e57df940 100644
--- a/qt-ui/usersurvey.cpp
+++ b/qt-ui/usersurvey.cpp
@@ -118,6 +118,7 @@ void UserSurvey::requestReceived()
 	}
 
 	msgbox.setWindowTitle(msgTitle);
+	msgbox.setWindowIcon(QIcon(":/subsurface-icon"));
 	msgbox.setText(msgText);
 	msgbox.setTextFormat(Qt::RichText);
 	msgbox.exec();