Some fixes

diff --git a/mac/macos_definitions.cmake b/mac/macos_definitions.cmake
index cd266a24..09326c85 100644
--- a/mac/macos_definitions.cmake
+++ b/mac/macos_definitions.cmake
@@ -12,12 +12,14 @@ endif()
 if(IS_PSIPLUS)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.psi-plus")
     set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2001-2019 Psi IM and Psi+ developers")
+    set(MACOSX_ICON_FILE "application-plus.icns")
 else(IS_PSIPLUS)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.psi-im")
     set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2001-2019 Psi IM developers")
+    set(MACOSX_ICON_FILE "application-plus.icns")
 endif(IS_PSIPLUS)

-set(MACOSX_ICON "${PROJECT_SOURCE_DIR}/mac/application.icns")
+set(MACOSX_ICON "${PROJECT_SOURCE_DIR}/mac/${MACOSX_ICON_FILE}")
 set(MACOSX_BUNDLE_LONG_VERSION_STRING ${CLIENT_NAME} ${APP_VERSION})
 set(MACOSX_BUNDLE_BUNDLE_NAME ${CLIENT_NAME})
 set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${APP_VERSION})
diff --git a/src/applicationinfo.cpp b/src/applicationinfo.cpp
index 2a5a4109..ae410f60 100644
--- a/src/applicationinfo.cpp
+++ b/src/applicationinfo.cpp
@@ -119,7 +119,12 @@ QString ApplicationInfo::resourcesDir()
     // in the Resources directory.
     QString     resourcePath;
     CFBundleRef mainBundle          = CFBundleGetMainBundle();
-    CFStringRef resourceCFStringRef = CFStringCreateWithCString(nullptr, "application.icns", kCFStringEncodingASCII);
+#ifdef PSI_PLUS
+    const char appIconName = "application-plus.icns";
+#else
+    const char appIconName = "application.icns";
+#endif
+    CFStringRef resourceCFStringRef = CFStringCreateWithCString(nullptr, appIconName, kCFStringEncodingASCII);
     CFURLRef    resourceURLRef      = CFBundleCopyResourceURL(mainBundle, resourceCFStringRef, nullptr, nullptr);
     if (resourceURLRef) {
         CFStringRef resourcePathStringRef = CFURLCopyFileSystemPath(resourceURLRef, kCFURLPOSIXPathStyle);