diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80fcfd668..9357bf4ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -356,6 +356,7 @@ ENDIF(NOT LMMS_HAVE_SAMPLERATE)
 
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/lmmsconfig.h.in ${CMAKE_BINARY_DIR}/lmmsconfig.h)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/lmms.rc.in ${CMAKE_BINARY_DIR}/lmms.rc)
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc.in ${CMAKE_BINARY_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc)
 
 # set compiler flags
 #SET(CMAKE_BUILD_TYPE relwithdebug)
diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt
index 5598c8151..995d6df5e 100644
--- a/plugins/zynaddsubfx/CMakeLists.txt
+++ b/plugins/zynaddsubfx/CMakeLists.txt
@@ -101,10 +101,19 @@ ENDIF(LMMS_BUILD_WIN32)
 BUILD_PLUGIN(zynaddsubfx ZynAddSubFx.cpp ZynAddSubFx.h MOCFILES ZynAddSubFx.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png)
 TARGET_LINK_LIBRARIES(zynaddsubfx ZynAddSubFxCore)
 
+IF(WIN32)
+	SET(WINRC "${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfxrc.obj")
+	ADD_CUSTOM_COMMAND(OUTPUT ${WINRC}
+				COMMAND ${WINDRES}
+					-I${CMAKE_CURRENT_SOURCE_DIR}
+					-o${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfxrc.obj
+					-i${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfx.rc
+				DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfx.rc)
+ENDIF(WIN32)
 
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI})
+ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI} ${WINRC})
 INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${PLUGIN_DIR})
 IF(LMMS_BUILD_LINUX)
 	SET(FONTCONFIG_LIBS -lfontconfig)
diff --git a/plugins/zynaddsubfx/src/UI/MasterUI.cc b/plugins/zynaddsubfx/src/UI/MasterUI.cc
index 75a212a45..bc1b836a9 100644
--- a/plugins/zynaddsubfx/src/UI/MasterUI.cc
+++ b/plugins/zynaddsubfx/src/UI/MasterUI.cc
@@ -2331,6 +2331,9 @@ configui=new ConfigUI();
 sequi=new SeqUI(master);
 
 make_window();
+#ifdef OS_WINDOWS
+masterwindow->icon((char *)LoadIcon(GetModuleHandle(NULL), "zynaddsubfx_icon"));
+#endif
 presetsui=new PresetsUI();
 setfilelabel(NULL);
 swapefftype=0;
diff --git a/plugins/zynaddsubfx/src/UI/MasterUI.fl b/plugins/zynaddsubfx/src/UI/MasterUI.fl
index af8440e1e..451c9f422 100644
--- a/plugins/zynaddsubfx/src/UI/MasterUI.fl
+++ b/plugins/zynaddsubfx/src/UI/MasterUI.fl
@@ -1636,6 +1636,9 @@ configui=new ConfigUI();
 sequi=new SeqUI(master);
 
 make_window();
+\#ifdef OS_WINDOWS
+masterwindow->icon((char *)LoadIcon(GetModuleHandle(NULL), "zynaddsubfx_icon"));
+\#endif
 presetsui=new PresetsUI();
 setfilelabel(NULL);
 swapefftype=0;
diff --git a/plugins/zynaddsubfx/zynaddsubfx.rc.in b/plugins/zynaddsubfx/zynaddsubfx.rc.in
new file mode 100644
index 000000000..ebc0c32ad
--- /dev/null
+++ b/plugins/zynaddsubfx/zynaddsubfx.rc.in
@@ -0,0 +1,26 @@
+zynaddsubfx_icon ICON zynaddsubfx_icon.ico
+#include <windows.h>
+
+VS_VERSION_INFO	VERSIONINFO
+  FILEVERSION	0,2,3,0
+  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+  FILEOS	VOS_NT_WINDOWS32
+  FILETYPE	VFT_APP
+  FILESUBTYPE	VFT2_UNKNOWN
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    //language ID = U.S. English, charset = Windows, Multilingual
+    BEGIN
+      VALUE "Comments",		"ZynAddSubFX Plugin - Linux MultiMedia Studio (http://lmms.sf.net)\0"
+      VALUE "CompanyName",	"LMMS Developers\0"
+      VALUE "FileDescription",	"ZynAddSubFX LMMS Plugin\0"
+      VALUE "FileVersion",	"2.3.0/@VERSION@\0"
+      VALUE "LegalCopyright",	"Copyright (c) Nasca Octavian Paul, Mark McCurry, Harald Hvaal, Tobias Doerffel\0"
+      VALUE "OriginalFilename",	"RemoteZynAddSubFx.exe\0"
+      VALUE "ProductName",	"ZynAddSubFX/LMMS\0"
+      VALUE "ProductVersion",	"2.3.0/@VERSION@\0"
+    END
+  END
+END
diff --git a/plugins/zynaddsubfx/zynaddsubfx_icon.ico b/plugins/zynaddsubfx/zynaddsubfx_icon.ico
new file mode 100644
index 000000000..80f0519d3
Binary files /dev/null and b/plugins/zynaddsubfx/zynaddsubfx_icon.ico differ