diff --git a/lib/solaar/ui/__init__.py b/lib/solaar/ui/__init__.py
index 399f6043..e4d6a34d 100644
--- a/lib/solaar/ui/__init__.py
+++ b/lib/solaar/ui/__init__.py
@@ -44,5 +44,13 @@ def error_dialog(title, text):
 	m.destroy()
 
 
+#
+#
+#
+
 from . import status_icon
 from . import notify, main_window
+
+
+from . import icons
+Gtk.Window.set_default_icon_from_file(icons.icon_file(main_window.NAME.lower()))
diff --git a/lib/solaar/ui/about.py b/lib/solaar/ui/about.py
index 994a7be6..64b4beb6 100644
--- a/lib/solaar/ui/about.py
+++ b/lib/solaar/ui/about.py
@@ -6,7 +6,6 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from gi.repository import Gtk
 
 from solaar import __version__, NAME
-from . import icons as _icons
 
 
 _dialog = None
@@ -15,12 +14,6 @@ _dialog = None
 def _create():
 	about = Gtk.AboutDialog()
 
-	icon_file = _icons.icon_file(NAME.lower())
-	if icon_file:
-		about.set_icon_from_file(icon_file)
-	else:
-		about.set_icon_name(NAME.lower())
-
 	about.set_program_name(NAME)
 	about.set_version(__version__)
 	about.set_comments('Shows status of devices connected\nto a Logitech Unifying Receiver.')
diff --git a/lib/solaar/ui/main_window.py b/lib/solaar/ui/main_window.py
index b1d9571a..60d0e2e1 100644
--- a/lib/solaar/ui/main_window.py
+++ b/lib/solaar/ui/main_window.py
@@ -304,16 +304,11 @@ def _show(w, trigger=None):
 # all created windows will be placed here, keyed by the receiver path
 _windows = {}
 
+
 def _create(receiver):
 	window = Gtk.Window()
 
 	window.set_title(NAME + ': ' + receiver.name)
-	icon_file = _icons.icon_file(NAME.lower())
-	if icon_file:
-		window.set_icon_from_file(icon_file)
-	else:
-		window.set_icon_name(NAME.lower())
-
 	window.set_role('status-window')
 	window.set_type_hint(Gdk.WindowTypeHint.UTILITY)