diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt
index c5fc5cb3..60021c8f 100644
--- a/src/wx/CMakeLists.txt
+++ b/src/wx/CMakeLists.txt
@@ -148,11 +148,14 @@ ENDIF( WIN32 )
 
 link_directories( ${CMAKE_BINARY_DIR} )
 
+SET(VBAM_ICON ${CMAKE_CURRENT_SOURCE_DIR}/icons/vbam.icns)
+
 ADD_EXECUTABLE (
     wxvbam
     WIN32
     MACOSX_BUNDLE
     ${SRC_WX}
+    ${VBAM_ICON}
 )
 
 TARGET_LINK_LIBRARIES (
@@ -170,12 +173,11 @@ IF(NOT WIN32 AND NOT APPLE)
 ENDIF(NOT WIN32 AND NOT APPLE)
 
 if(APPLE)
-    SET(CMAKE_EXECUTABLE_SUFFIX .app)
     # this should set ROM file types correctly
     SET_PROPERTY(TARGET wxvbam APPEND PROPERTY MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/wxplist.in)
-    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/icons/wxvbam.icns DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
-    SET(MACOSX_BUNDLE_ICON_FILE wxvbam.icns)
-    SET_SOURCE_FILES_PROPERTIES(wxvbam.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+    # file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/icons/vbam.icns DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
+    SET(MACOSX_BUNDLE_ICON_FILE vbam.icns)
+    SET_SOURCE_FILES_PROPERTIES(${VBAM_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 endif(APPLE)
     
 SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})
diff --git a/src/wx/icons/vbam.icns b/src/wx/icons/vbam.icns
new file mode 100644
index 00000000..647ec3ed
Binary files /dev/null and b/src/wx/icons/vbam.icns differ
diff --git a/src/wx/icons/wxvbam.icns b/src/wx/icons/wxvbam.icns
deleted file mode 100644
index 72fd5a17..00000000
Binary files a/src/wx/icons/wxvbam.icns and /dev/null differ
diff --git a/src/wx/wxplist.in b/src/wx/wxplist.in
index b0f310a8..0ccce027 100644
--- a/src/wx/wxplist.in
+++ b/src/wx/wxplist.in
@@ -42,7 +42,7 @@
 	     <key>UTTypeDescription</key>
 	     <string>GameBoy Advance ROM</string>
 	     <key>UTTypeIconFile</key>
-	     <string>wxvbam.icns</string>
+	     <string>${MACOSX_BUNDLE_ICON_FILE}</string>
 	     <key>UTTypeConformsTo</key>
 	     <array>
 	        <string>public.data</string>
@@ -77,7 +77,7 @@
 	     <key>UTTypeDescription</key>
 	     <string>GameBoy ROM</string>
 	     <key>UTTypeIconFile</key>
-	     <string>wxvbam.icns</string>
+	     <string>${MACOSX_BUNDLE_ICON_FILE}</string>
 	     <key>UTTypeConformsTo</key>
 	     <array>
 	        <string>public.data</string>