diff --git a/cockatrice/cockatrice.pro b/cockatrice/cockatrice.pro
index 6348efed..6faeeff7 100644
--- a/cockatrice/cockatrice.pro
+++ b/cockatrice/cockatrice.pro
@@ -112,4 +112,10 @@ SOURCES += src/counter.cpp \
 	../common/protocol_datastructures.cpp
  
 TRANSLATIONS += translations/cockatrice_de.ts translations/cockatrice_en.ts
-CONFIG += qt debug
+win32 {
+	RC_FILE = cockatrice.rc
+}
+macx {
+	ICON = resources/appicon.icns
+	CONFIG += x86 ppc
+}
diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc
index 052b8289..38910b7e 100644
--- a/cockatrice/cockatrice.qrc
+++ b/cockatrice/cockatrice.qrc
@@ -24,7 +24,7 @@
         <file>resources/hr.jpg</file>
         <file>translations/cockatrice_de.qm</file>
         <file>translations/cockatrice_en.qm</file>
-        <file>resources/icon.svg</file>
+        <file>resources/appicon.svg</file>
         <file>resources/add_to_sideboard.svg</file>
         <file>resources/decrement.svg</file>
         <file>resources/increment.svg</file>
diff --git a/cockatrice/cockatrice.rc b/cockatrice/cockatrice.rc
new file mode 100644
index 00000000..d7108130
--- /dev/null
+++ b/cockatrice/cockatrice.rc
@@ -0,0 +1 @@
+ID1_ICON1	ICON	DISCARDABLE	"resources/appicon.ico"
diff --git a/cockatrice/resources/appicon.icns b/cockatrice/resources/appicon.icns
new file mode 100644
index 00000000..4bd00ffc
Binary files /dev/null and b/cockatrice/resources/appicon.icns differ
diff --git a/cockatrice/resources/appicon.ico b/cockatrice/resources/appicon.ico
new file mode 100644
index 00000000..9a4885f4
Binary files /dev/null and b/cockatrice/resources/appicon.ico differ
diff --git a/cockatrice/resources/icon.svg b/cockatrice/resources/appicon.svg
similarity index 100%
rename from cockatrice/resources/icon.svg
rename to cockatrice/resources/appicon.svg
diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp
index 1c3c43e9..a54a7db9 100644
--- a/cockatrice/src/main.cpp
+++ b/cockatrice/src/main.cpp
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
 	MainWindow ui;
 	qDebug("main(): MainWindow constructor finished");
 	
-	QIcon icon(":/resources/icon.svg");
+	QIcon icon(":/resources/appicon.svg");
 	ui.setWindowIcon(icon);
 	
 	ui.show();