diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d500d81e..d6155789a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -340,10 +340,12 @@ if (WIN32)
     configure_file(${OpenMW_SOURCE_DIR}/files/plugins.cfg.win32
         "${OpenMW_BINARY_DIR}/plugins.cfg" COPYONLY)
 endif (WIN32)
-if (LINUX)
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     configure_file(${OpenMW_SOURCE_DIR}/files/plugins.cfg.linux
         "${OpenMW_BINARY_DIR}/plugins.cfg")
-endif (LINUX)
+endif()
+
 if (APPLE)
     configure_file(${OpenMW_SOURCE_DIR}/files/plugins.cfg.mac
         "${APP_BUNDLE_DIR}/Contents/MacOS/plugins.cfg")
diff --git a/apps/launcher/resources/openmw-icon.png b/apps/launcher/resources/openmw-icon.png
new file mode 100644
index 000000000..7a5393821
Binary files /dev/null and b/apps/launcher/resources/openmw-icon.png differ