diff --git a/artiq/gui/icon.png b/artiq/gui/icon.png
new file mode 100644
index 000000000..33c071886
Binary files /dev/null and b/artiq/gui/icon.png differ
diff --git a/artiq/gui/scheduler.py b/artiq/gui/scheduler.py
index 46bca03f6..e00fd0ebd 100644
--- a/artiq/gui/scheduler.py
+++ b/artiq/gui/scheduler.py
@@ -3,6 +3,7 @@ import asyncio
 
 from gi.repository import Gtk
 
+from artiq.gui.tools import Window
 from artiq.management.sync_struct import Subscriber
 
 
@@ -77,10 +78,9 @@ class _PeriodicStoreSyncer:
         del self.order[i]
 
 
-class SchedulerWindow(Gtk.Window):
+class SchedulerWindow(Window):
     def __init__(self):
-        Gtk.Window.__init__(self, title="Scheduler")
-        self.set_border_width(6)
+        Window.__init__(self, title="Scheduler")
         self.set_default_size(720, 570)
 
         vpane = Gtk.VPaned()
diff --git a/artiq/gui/tools.py b/artiq/gui/tools.py
new file mode 100644
index 000000000..17012b29b
--- /dev/null
+++ b/artiq/gui/tools.py
@@ -0,0 +1,13 @@
+import os
+
+from gi.repository import Gtk
+
+
+data_dir = os.path.abspath(os.path.dirname(__file__))
+
+class Window(Gtk.Window):
+    def __init__(self, *args, **kwargs):
+        Gtk.Window.__init__(self, *args, **kwargs)
+        self.set_wmclass("ARTIQ GUI", "ARTIQ GUI")
+        self.set_icon_from_file(os.path.join(data_dir, "icon.png"))
+        self.set_border_width(6)