diff --git a/nw/__init__.py b/nw/__init__.py
index 3330c6b6..332b7009 100644
--- a/nw/__init__.py
+++ b/nw/__init__.py
@@ -31,6 +31,7 @@ import logging
 
 from os import path, remove, rename
 
+from PyQt5.QtGui import QIcon
 from PyQt5.QtWidgets import QApplication
 
 from nw.guimain import GuiMain
@@ -225,6 +226,8 @@ def main(sysArgs=None):
         nwApp = QApplication([__package__,("-style=%s" % qtStyle)])
         nwApp.setApplicationName(__package__)
         nwApp.setApplicationVersion(__version__)
+        nwApp.setWindowIcon(QIcon(CONFIG.appIcon))
+        nwApp.setOrganizationDomain("novelwriter.io")
         nwGUI = GuiMain()
         sys.exit(nwApp.exec_())
 
diff --git a/nw/assets/icons/novelWriter.png b/nw/assets/icons/novelWriter.png
new file mode 100644
index 00000000..4543f575
Binary files /dev/null and b/nw/assets/icons/novelWriter.png differ
diff --git a/nw/gui/elements/doctree.py b/nw/gui/elements/doctree.py
index 92a006de..e67bd1b6 100644
--- a/nw/gui/elements/doctree.py
+++ b/nw/gui/elements/doctree.py
@@ -31,7 +31,7 @@ import nw
 from PyQt5.QtCore import Qt, QSize
 from PyQt5.QtGui import QFont, QColor
 from PyQt5.QtWidgets import (
-    QTreeWidget, QTreeWidgetItem, QAbstractItemView, QApplication, QMessageBox
+    qApp, QTreeWidget, QTreeWidgetItem, QAbstractItemView, QMessageBox
 )
 
 from nw.core import NWDoc
@@ -207,7 +207,7 @@ class GuiDocTree(QTreeWidget):
         """Move an item up or down in the tree, but only if the treeView
         has focus. This also applies when the menu is used.
         """
-        if QApplication.focusWidget() == self and self.theParent.hasProject:
+        if qApp.focusWidget() == self and self.theParent.hasProject:
             tHandle = self.getSelectedHandle()
             tItem   = self._getTreeItem(tHandle)
             pItem   = tItem.parent()
diff --git a/nw/gui/elements/searchbar.py b/nw/gui/elements/searchbar.py
index 68518d8d..ad9f9e81 100644
--- a/nw/gui/elements/searchbar.py
+++ b/nw/gui/elements/searchbar.py
@@ -30,7 +30,7 @@ import nw
 
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import (
-    QFrame, QGridLayout, QLabel, QLineEdit, QPushButton, QApplication
+    qApp, QFrame, QGridLayout, QLabel, QLineEdit, QPushButton
 )
 
 from nw.constants import nwDocAction
@@ -127,7 +127,7 @@ class GuiSearchBar(QFrame):
         return
 
     def _doSearch(self):
-        modKey = QApplication.keyboardModifiers()
+        modKey = qApp.keyboardModifiers()
         if modKey == Qt.ShiftModifier:
             self.theParent.docEditor.docAction(nwDocAction.GO_PREV)
         else: