diff --git a/Makefile.am b/Makefile.am
index ea90905b..3a281c97 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,7 @@ core_sources = \
 	src/plugins/themes.c src/plugins/themes.h \
 	src/plugins/settings.c src/plugins/settings.h \
 	src/plugins/disco.c src/plugins/disco.h \
-	src/tray.h src/tray.c
+	src/ui/tray.h src/ui/tray.c
 
 unittest_sources = \
 	src/xmpp/contact.c src/xmpp/contact.h src/common.c \
@@ -93,7 +93,7 @@ unittest_sources = \
 	src/window_list.c src/window_list.h \
 	src/event/server_events.c src/event/server_events.h \
 	src/event/client_events.c src/event/client_events.h \
-	src/tray.h src/tray.c \
+	src/ui/tray.h src/ui/tray.c \
 	tests/unittests/xmpp/stub_xmpp.c \
 	tests/unittests/ui/stub_ui.c \
 	tests/unittests/log/stub_log.c \
diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index fbcd944b..b65c33f1 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -81,7 +81,7 @@
 #include "window_list.h"
 #include "event/client_events.h"
 #ifdef HAVE_GTK
-#include "tray.h"
+#include "ui/tray.h"
 #endif
 #include "tools/http_upload.h"
 #ifdef HAVE_PYTHON
diff --git a/src/profanity.c b/src/profanity.c
index 691f39d7..456cae3b 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -38,7 +38,7 @@
 #endif
 
 #ifdef HAVE_GTK
-#include "tray.h"
+#include "ui/tray.h"
 #endif
 #include <locale.h>
 #include <signal.h>
diff --git a/src/tray.c b/src/ui/tray.c
similarity index 100%
rename from src/tray.c
rename to src/ui/tray.c
diff --git a/src/tray.h b/src/ui/tray.h
similarity index 98%
rename from src/tray.h
rename to src/ui/tray.h
index 1f8f13d8..f33176e7 100644
--- a/src/tray.h
+++ b/src/ui/tray.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef TRAY_H
-#define TRAY_H
+#ifndef UI_TRAY_H
+#define UI_TRAY_H
 
 void tray_init(void);
 void tray_update(void);