diff --git a/gui/ocarina.cpp b/gui/ocarina.cpp
index 6dfb3508..c47d100d 100644
--- a/gui/ocarina.cpp
+++ b/gui/ocarina.cpp
@@ -14,6 +14,7 @@ void ocarina_init(int argc, char **argv)
 	gtk_init(&argc, &argv);
 	window_init();
 	window_title("Ocarina " + vers_str());
+	window_icon("images/ocarina.png");
 
 	hbox  = gtk_hbox_new(FALSE, 0);
 	play  = make_play_button(GTK_ICON_SIZE_MENU);
diff --git a/gui/window.cpp b/gui/window.cpp
index c65c59f2..d7d4f6fd 100644
--- a/gui/window.cpp
+++ b/gui/window.cpp
@@ -23,6 +23,11 @@ void window_title(string title)
 	gtk_window_set_title(GTK_WINDOW(window), title.c_str());
 }
 
+void window_icon(string file)
+{
+	gtk_window_set_icon_from_file(GTK_WINDOW(window), file.c_str(), NULL);
+}
+
 void window_init()
 {
 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
diff --git a/include/ocarina/window.h b/include/ocarina/window.h
index cad69347..5e98c0d1 100644
--- a/include/ocarina/window.h
+++ b/include/ocarina/window.h
@@ -7,5 +7,6 @@ void window_resize(int, int);
 void window_init();
 void window_add(GtkWidget *);
 void window_title(string);
+void window_icon(string);
 
 #endif