diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24a8364..d0c36f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -341,6 +341,7 @@ endif(MINGW)
 IF (NOT BUNDLE_APP)
     configure_files(${PROJECT_SOURCE_DIR}/font ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} "*.fnt")
     configure_files(${PROJECT_SOURCE_DIR}/font ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} "*.png")
+    configure_files(${PROJECT_SOURCE_DIR}/icon ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} CubicSDR.ico)
     add_executable(CubicSDR ${cubicsdr_sources} ${cubicsdr_headers} ${RES_FILES})
     target_link_libraries(CubicSDR rtlsdr ${LIQUID_LIB} ${FFTW_LIB} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${OTHER_LIBRARIES})
 ENDIF (NOT BUNDLE_APP)
diff --git a/cubicsdr.rc b/cubicsdr.rc
index b395d8f..38c3ee2 100644
--- a/cubicsdr.rc
+++ b/cubicsdr.rc
@@ -1 +1,2 @@
-id ICON "icon/CubicSDR.ico"
\ No newline at end of file
+id ICON "icon/CubicSDR.ico"
+frame_icon ICON "icon/CubicSDR.ico"
\ No newline at end of file
diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp
index 0b68e56..9f643ba 100644
--- a/src/AppFrame.cpp
+++ b/src/AppFrame.cpp
@@ -232,6 +232,8 @@ wxFrame(NULL, wxID_ANY, CUBICSDR_TITLE), activeDemodulator(NULL) {
     Centre();
     Show();
 
+    SetIcon(wxICON(frame_icon));
+
     GetStatusBar()->SetStatusText(wxString::Format(wxT("Set center frequency: %i"), DEFAULT_FREQ));
 
     wxAcceleratorEntry entries[3];