diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,6 +46,9 @@
     PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5AtCoreConfigVersion.cmake"
     SOVERSION 1
 )
+if(APPLE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -std=c++11")
+endif()
 
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUXX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ")
diff --git a/src/atcore.cpp b/src/atcore.cpp
--- a/src/atcore.cpp
+++ b/src/atcore.cpp
@@ -76,15 +76,8 @@
         qCritical() << "No valid path for plugin !";
     }
 
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
     d->pluginsDir = qApp->applicationDirPath() + QStringLiteral("/plugins");
-
-#elif defined(Q_OS_MAC)
-    if (d->pluginsDir.dirName() == "MacOS") {
-        d->pluginsDir.cdUp();
-        d->pluginsDir.cdUp();
-        d->pluginsDir.cdUp();
-    }
 #endif
     qCDebug(ATCORE_PLUGIN) << d->pluginsDir;
     findPlugins();
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -24,7 +24,7 @@
 add_library(aprinter SHARED ${AprinterPlugin_SRCS})
 target_link_libraries(aprinter Qt5::Core KF5::AtCore)
 
-if(WIN32)
+if(WIN32 OR APPLE)
     install(
     TARGETS
         repetier
diff --git a/testclient/CMakeLists.txt b/testclient/CMakeLists.txt
--- a/testclient/CMakeLists.txt
+++ b/testclient/CMakeLists.txt
@@ -15,22 +15,30 @@
     Widgets
     SerialPort
 )
+if (NOT APPLE)
+	add_executable(AtCoreTest ${AtCoreTestClient_SRCS})
 
-add_executable(AtCoreTest ${AtCoreTestClient_SRCS})
+	install(TARGETS AtCoreTest RUNTIME DESTINATION bin)
 
-target_link_libraries(AtCoreTest AtCoreTestWidgets KF5::AtCore Qt5::Widgets Qt5::Charts)
+	install(FILES
+        "${CMAKE_CURRENT_SOURCE_DIR}/AtCoreTest.menu"
+        RENAME AtCoreTest
+        DESTINATION share/menu)
+
+	install(FILES
+        "${CMAKE_CURRENT_SOURCE_DIR}/AtCoreTest.png"
+        DESTINATION share/pixmaps)
 
-install(TARGETS AtCoreTest RUNTIME DESTINATION bin)
+	install(FILES
+        "${CMAKE_CURRENT_SOURCE_DIR}/AtCoreTest.desktop"
+        DESTINATION share/applications)
+else()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -std=c++11")
+    add_executable(AtCoreTest MACOSX_BUNDLE ${AtCoreTestClient_SRCS})
+    install(TARGETS AtCoreTest BUNDLE DESTINATION bin)
+endif()
+
+target_link_libraries(AtCoreTest AtCoreTestWidgets KF5::AtCore Qt5::Widgets Qt5::Charts)
 
-install(FILES
-    "${CMAKE_CURRENT_SOURCE_DIR}/AtCoreTest.menu"
-    RENAME AtCoreTest
-    DESTINATION share/menu)
 
-install(FILES
-    "${CMAKE_CURRENT_SOURCE_DIR}/AtCoreTest.png"
-    DESTINATION share/pixmaps)
 
-install(FILES
-    "${CMAKE_CURRENT_SOURCE_DIR}/AtCoreTest.desktop"
-    DESTINATION share/applications)
diff --git a/testclient/mainwindow.cpp b/testclient/mainwindow.cpp
--- a/testclient/mainwindow.cpp
+++ b/testclient/mainwindow.cpp
@@ -54,6 +54,11 @@
 
     populateCBs();
 
+    //Icon for actionQuit
+#ifndef Q_OS_MAC
+    ui->actionQuit->setIcon(QIcon::fromTheme(QStringLiteral("application-exit")));
+#endif
+
     //hide the printing progress bar.
     ui->printLayout->setVisible(false);
 
diff --git a/testclient/mainwindow.ui b/testclient/mainwindow.ui
--- a/testclient/mainwindow.ui
+++ b/testclient/mainwindow.ui
@@ -939,10 +939,6 @@
    <addaction name="menuView"/>
   </widget>
   <action name="actionQuit">
-   <property name="icon">
-    <iconset theme="application-exit">
-     <normaloff>.</normaloff>.</iconset>
-   </property>
    <property name="text">
     <string>&amp;Quit</string>
    </property>
diff --git a/testclient/widgets/CMakeLists.txt b/testclient/widgets/CMakeLists.txt
--- a/testclient/widgets/CMakeLists.txt
+++ b/testclient/widgets/CMakeLists.txt
@@ -3,5 +3,7 @@
     )
 
 add_library(AtCoreTestWidgets STATIC ${widgets_SRCS})
-
+if (APPLE)
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -std=c++11")
+endif()
 target_link_libraries(AtCoreTestWidgets Qt5::Core Qt5::Widgets Qt5::Charts)