diff --git a/src/command/commands.c b/src/command/commands.c
index e1eba540..50877227 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -5546,9 +5546,9 @@ cmd_tray(ProfWin *window, const char *const command, gchar **args)
     gboolean new = prefs_get_boolean(PREF_TRAY);
     if (old != new) {
         if (new) {
-            create_tray();
+            tray_enable();
         } else {
-            destroy_tray();
+            tray_disable();
         }
     }
     return TRUE;
diff --git a/src/profanity.c b/src/profanity.c
index 4ca649cd..1140594f 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -38,7 +38,6 @@
 #endif
 
 #ifdef HAVE_GTK
-#include <gtk/gtk.h>
 #include "tray.h"
 #endif
 #include <locale.h>
@@ -96,21 +95,10 @@ char *saved_status;
 
 static gboolean cont = TRUE;
 static gboolean force_quit = FALSE;
-#ifdef HAVE_GTK
-static gboolean gtk_ready = FALSE;
-#endif
 
 void
 prof_run(char *log_level, char *account_name)
 {
-#ifdef HAVE_GTK
-    gtk_ready = gtk_init_check(0, NULL);
-    log_debug("Env is GTK-ready: %s", gtk_ready ? "true" : "false");
-    if (gtk_ready) {
-        gtk_init(0, NULL);
-        gtk_main_iteration_do(FALSE);
-    }
-#endif
     _init(log_level);
     plugins_on_start();
     _connect_default(account_name);
@@ -146,9 +134,7 @@ prof_run(char *log_level, char *account_name)
         iq_autoping_check();
         ui_update();
 #ifdef HAVE_GTK
-        if (gtk_ready) {
-            gtk_main_iteration_do(FALSE);
-        }
+        tray_update();
 #endif
     }
 }
@@ -373,10 +359,7 @@ _init(char *log_level)
     atexit(_shutdown);
     plugins_init();
 #ifdef HAVE_GTK
-    if (gtk_ready && prefs_get_boolean(PREF_TRAY)) {
-        log_debug("Building GTK icon");
-        create_tray();
-    }
+    tray_init();
 #endif
     inp_nonblocking(TRUE);
 }
@@ -397,9 +380,7 @@ _shutdown(void)
         cl_ev_disconnect();
     }
 #ifdef HAVE_GTK
-    if (gtk_ready && prefs_get_boolean(PREF_TRAY)) {
-        destroy_tray();
-    }
+    tray_shutdown();
 #endif
     jabber_shutdown();
     plugins_on_shutdown();
diff --git a/src/tray.c b/src/tray.c
index 98039977..ff9593c3 100644
--- a/src/tray.c
+++ b/src/tray.c
@@ -42,7 +42,9 @@
 #include "tray.h"
 #include "window_list.h"
 #include "log.h"
+#include "config/preferences.h"
 
+static gboolean gtk_ready = FALSE;
 static GtkStatusIcon *prof_tray = NULL;
 static GString *icon_filename = NULL;
 static GString *icon_msg_filename = NULL;
@@ -141,16 +143,53 @@ _tray_change_icon(gpointer data)
 /* {{{ Public */
 
 void
-create_tray(void)
+tray_init(void)
 {
     _get_icons();
+    gtk_ready = gtk_init_check(0, NULL);
+    log_debug("Env is GTK-ready: %s", gtk_ready ? "true" : "false");
+    if (!gtk_ready) {
+        return;
+    }
+
+    gtk_init(0, NULL);
+    if (prefs_get_boolean(PREF_TRAY)) {
+        log_debug("Building GTK icon");
+        tray_enable();
+    }
+
+    gtk_main_iteration_do(FALSE);
+}
+
+void
+tray_update(void)
+{
+    if (gtk_ready) {
+        gtk_main_iteration_do(FALSE);
+    }
+}
+
+void
+tray_shutdown(void)
+{
+    if (gtk_ready && prefs_get_boolean(PREF_TRAY)) {
+        tray_disable();
+    }
+    g_string_free(icon_filename, TRUE);
+    g_string_free(icon_msg_filename, TRUE);
+}
+
+void
+tray_enable(void)
+{
     prof_tray = gtk_status_icon_new_from_file(icon_filename->str);
     shutting_down = FALSE;
+    _tray_change_icon(NULL);
     timer = g_timeout_add(5000, _tray_change_icon, NULL);
 }
 
 void
-destroy_tray(void)
+tray_disable(void)
 {
     shutting_down = TRUE;
     g_source_remove(timer);
@@ -158,8 +197,6 @@ destroy_tray(void)
         g_clear_object(&prof_tray);
         prof_tray = NULL;
     }
-    g_string_free(icon_filename, TRUE);
-    g_string_free(icon_msg_filename, TRUE);
 }
 
 /* }}} */
diff --git a/src/tray.h b/src/tray.h
index 416ca7d2..81ddd20f 100644
--- a/src/tray.h
+++ b/src/tray.h
@@ -35,16 +35,20 @@
 #ifndef PROFANITY_TRAY_H
 #define PROFANITY_TRAY_H
 
+void tray_init(void);
+void tray_update(void);
+void tray_shutdown(void);
+
 /*
  * Create tray icon
  *
  * This will initialize the timer that will be called in order to change the icons
  * and will search the icons in the defaults paths
  */
-void create_tray(void);
+void tray_enable(void);
 /*
  * Destroy tray icon
  */
-void destroy_tray(void);
+void tray_disable(void);
 
 #endif