diff --git a/MainWindow.cpp b/MainWindow.cpp
index c72e71d..7db921e 100644
--- a/MainWindow.cpp
+++ b/MainWindow.cpp
@@ -2,12 +2,16 @@
 #include "MainWindow.h"
 
 #include <QSettings>
+#include <QIcon>
 
 MainWindow::MainWindow (QWidget *parent) : QMainWindow (parent)
 {
 	setWindowFlags(Qt::FramelessWindowHint);
 	setGeometry(100, 100, 275, 116);
-	
+#ifndef _WIN32
+	setWindowIcon (QIcon (":icon.png"));
+#endif
+
 	/* 
 	 * The MainDisplay is the mainwindow non-shaded mode
 	 */
diff --git a/Playlist.cpp b/Playlist.cpp
index 845715c..bf74185 100644
--- a/Playlist.cpp
+++ b/Playlist.cpp
@@ -4,6 +4,7 @@
 #include <QMouseEvent>
 #include <QPaintEvent>
 #include <QRect>
+#include <QIcon>
 
 PlaylistScrollButton::PlaylistScrollButton (PlaylistScroller *parent, uint normal, uint pressed) : Button (parent, normal, pressed, true)
 {
@@ -79,6 +80,10 @@ PlaylistWindow::PlaylistWindow (QWidget *parent) : QMainWindow (parent)
 {
 	Skin *skin = Skin::getInstance ();
 
+#ifndef _WIN32
+	setWindowIcon (QIcon (":icon.png"));
+#endif
+
 	setWindowFlags (Qt::FramelessWindowHint);
 	connect (skin, SIGNAL (skinChanged (Skin *)),
 	         this, SLOT (setPixmaps(Skin *)));
diff --git a/SkinChooser.cpp b/SkinChooser.cpp
index 7c6d258..91bf4ae 100644
--- a/SkinChooser.cpp
+++ b/SkinChooser.cpp
@@ -3,11 +3,17 @@
 #include "SkinChooser.h"
 
 #include <QDir>
+#include <QIcon>
 #include <QFile>
 #include <QSettings>
 
 SkinChooser::SkinChooser (QWidget *parent) : QMainWindow (parent)
 {
+
+#ifndef _WIN32
+	setWindowIcon (QIcon (":icon.png"));
+#endif
+	
 	m_mw = dynamic_cast<MainWindow *>(parent);
 	QWidget *c = new QWidget (this);
 	setCentralWidget (c);
diff --git a/icon.png b/icon.png
new file mode 100644
index 0000000..0fc88c4
Binary files /dev/null and b/icon.png differ
diff --git a/promoe.pro b/promoe.pro
index e54bfed..575a5dd 100644
--- a/promoe.pro
+++ b/promoe.pro
@@ -38,7 +38,10 @@ HEADERS += XmmsQT4.h \
 		   PlaylistList.h \
 		   SkinChooser.h
 
+
+RESOURCES = promoe.qrc
 CONFIG += link_pkgconfig
 CONFIG += debug warn_on
 QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
 PKGCONFIG += xmms2-client xmms2-client-cpp sigc++-2.0
+
diff --git a/promoe.qrc b/promoe.qrc
new file mode 100644
index 0000000..bdabac9
--- /dev/null
+++ b/promoe.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+	<qresource>
+		<file>icon.png</file>
+	</qresource>
+</RCC>