diff --git a/core/dbushelper.cpp b/core/dbushelper.cpp
index b9a16a8d..2415849d 100644
--- a/core/dbushelper.cpp
+++ b/core/dbushelper.cpp
@@ -1,191 +1,179 @@
 /**
  * Copyright 2014 Albert Vaca <albertvaka@gmail.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "dbushelper.h"
 #include "core_debug.h"
 
 #include <QRegExp>
 #include <QProcess>
 #include <QDebug>
 #include <QUrl>
 #include <QFile>
 #include <QCoreApplication>
+#include <QStandardPaths>
 
 #include "kdeconnectconfig.h"
 
 #ifdef Q_OS_MAC
-#include <CoreFoundation/CFBundle.h>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
 #endif
 
 namespace DbusHelper {
 
 #ifdef USE_PRIVATE_DBUS
 class DBusInstancePrivate
 {
 public:
     DBusInstancePrivate();
     ~DBusInstancePrivate();
 
     void launchDBusDaemon();
     void closeDBusDaemon();
 private:
     QProcess *m_dbusProcess;
 };
 
 static DBusInstancePrivate dbusInstance;
 #endif
 
 void filterNonExportableCharacters(QString& s)
 {
     static QRegExp regexp(QStringLiteral("[^A-Za-z0-9_]"), Qt::CaseSensitive, QRegExp::Wildcard);
     s.replace(regexp,QLatin1String("_"));
 }
 
 QDBusConnection sessionBus()
 {
 #ifdef USE_PRIVATE_DBUS
     return QDBusConnection::connectToBus(KdeConnectConfig::instance()->privateDBusAddress(),
         QStringLiteral(KDECONNECT_PRIVATE_DBUS_NAME));
 #else
     return QDBusConnection::sessionBus();
 #endif
 }
 
 #ifdef USE_PRIVATE_DBUS
 void launchDBusDaemon()
 {
     dbusInstance.launchDBusDaemon();
     qAddPostRoutine(closeDBusDaemon);
 }
 
 void closeDBusDaemon()
 {
     dbusInstance.closeDBusDaemon();
 }
 
 #ifdef Q_OS_MAC
 void macosUnsetLaunchctlEnv()
 {
     // Unset Launchd env
     QProcess unsetLaunchdDBusEnv;
     unsetLaunchdDBusEnv.setProgram(QStringLiteral("launchctl"));
     unsetLaunchdDBusEnv.setArguments({
         QStringLiteral("unsetenv"),
         QStringLiteral(KDECONNECT_SESSION_DBUS_LAUNCHD_ENV)
     });
     unsetLaunchdDBusEnv.start();
     unsetLaunchdDBusEnv.waitForFinished();
 }
 #endif
 
 void DBusInstancePrivate::launchDBusDaemon()
 {
     // Kill old dbus daemon
     if (m_dbusProcess != nullptr) closeDBusDaemon();
 
     // Start dbus daemon
     m_dbusProcess = new QProcess();
-    #ifdef Q_OS_MAC
-        // On macOS, assuming the executable is in Contents/MacOS
-        CFURLRef url = (CFURLRef)CFAutorelease((CFURLRef)CFBundleCopyBundleURL(CFBundleGetMainBundle()));
-        QString basePath = QUrl::fromCFURL(url).path();
-        QString kdeconnectDBusExecutable = basePath + QStringLiteral("Contents/MacOS/dbus-daemon"),
-                kdeconnectDBusConfiguration = basePath + QStringLiteral("Contents/Resources/dbus-1/session.conf");
-        qCDebug(KDECONNECT_CORE) << "App package path: " << basePath;
-
-        m_dbusProcess->setProgram(kdeconnectDBusExecutable);
-        m_dbusProcess->setArguments({QStringLiteral("--print-address"),
-            QStringLiteral("--nofork"),
-            QStringLiteral("--config-file=") + kdeconnectDBusConfiguration,
-            QStringLiteral("--address=") + QStringLiteral(KDECONNECT_PRIVATE_DBUS_ADDR)});
-        m_dbusProcess->setWorkingDirectory(basePath);
-    #elif defined(Q_OS_WIN)
-        // On Windows
-        m_dbusProcess->setProgram(QStringLiteral("dbus-daemon.exe"));
-        m_dbusProcess->setArguments({QStringLiteral("--session"),
-            QStringLiteral("--print-address"),
-            QStringLiteral("--nofork"),
-            QStringLiteral("--address=") + QStringLiteral(KDECONNECT_PRIVATE_DBUS_ADDR)});
-    #else
-        // On Linux or other unix-like system
-        m_dbusProcess->setProgram(QStringLiteral("dbus-daemon"));
-        m_dbusProcess->setArguments({QStringLiteral("--session"),
-            QStringLiteral("--print-address"),
-            QStringLiteral("--nofork"),
-            QStringLiteral("--address=") + QStringLiteral(KDECONNECT_PRIVATE_DBUS_ADDR)});
-    #endif
+
+    QString kdeconnectDBusConfiguration;
+    QString dbusDaemonExecutable = QStandardPaths::findExecutable(QStringLiteral("dbus-daemon"), { QCoreApplication::applicationDirPath() });
+    if (!dbusDaemonExecutable.isNull()) {
+        kdeconnectDBusConfiguration = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("dbus-1/session.conf"));
+    } else {
+        // macOS Debug env
+        dbusDaemonExecutable = QString::fromLatin1(qgetenv("craftRoot")) + QStringLiteral("/../bin/dbus-daemon");
+        kdeconnectDBusConfiguration = QString::fromLatin1(qgetenv("craftRoot")) + QStringLiteral("/../share/dbus-1/session.conf");
+    }
+    m_dbusProcess->setProgram(dbusDaemonExecutable);
+    m_dbusProcess->setArguments({QStringLiteral("--print-address"),
+        QStringLiteral("--nofork"),
+        QStringLiteral("--config-file=") + kdeconnectDBusConfiguration,
+        QStringLiteral("--address=") + QStringLiteral(KDECONNECT_PRIVATE_DBUS_ADDR)
+    });
+    m_dbusProcess->setWorkingDirectory(QCoreApplication::applicationDirPath());
     m_dbusProcess->setStandardOutputFile(KdeConnectConfig::instance()->privateDBusAddressPath());
     m_dbusProcess->setStandardErrorFile(QProcess::nullDevice());
     m_dbusProcess->start();
 
 #ifdef Q_OS_MAC
     // Set launchctl env
     QString privateDBusAddress = KdeConnectConfig::instance()->privateDBusAddress();
     QRegularExpressionMatch path;
     if (privateDBusAddress.contains(QRegularExpression(
             QStringLiteral("path=(?<path>/tmp/dbus-[A-Za-z0-9]+)")
         ), &path)) {
         qCDebug(KDECONNECT_CORE) << "DBus address: " << path.captured(QStringLiteral("path"));
         QProcess setLaunchdDBusEnv;
         setLaunchdDBusEnv.setProgram(QStringLiteral("launchctl"));
         setLaunchdDBusEnv.setArguments({
             QStringLiteral("setenv"),
             QStringLiteral(KDECONNECT_SESSION_DBUS_LAUNCHD_ENV),
             path.captured(QStringLiteral("path"))
         });
         setLaunchdDBusEnv.start();
         setLaunchdDBusEnv.waitForFinished();
     } else {
         qCDebug(KDECONNECT_CORE) << "Cannot get dbus address";
     }
 #endif
 }
 
 void DBusInstancePrivate::closeDBusDaemon()
 {
     if (m_dbusProcess != nullptr)
     {
         m_dbusProcess->terminate();
         m_dbusProcess->waitForFinished();
         delete m_dbusProcess;
         m_dbusProcess = nullptr;
 
         QFile privateDBusAddressFile(KdeConnectConfig::instance()->privateDBusAddressPath());
 
         if (privateDBusAddressFile.exists()) privateDBusAddressFile.resize(0);
 
 #ifdef Q_OS_MAC
         macosUnsetLaunchctlEnv();
 #endif
     }
 }
 
 DBusInstancePrivate::DBusInstancePrivate()
     :m_dbusProcess(nullptr){}
 
 DBusInstancePrivate::~DBusInstancePrivate()
 {
     closeDBusDaemon();
 }
 #endif
 
 }
diff --git a/indicator/CMakeLists.txt b/indicator/CMakeLists.txt
index f2b889b5..6a0e6410 100644
--- a/indicator/CMakeLists.txt
+++ b/indicator/CMakeLists.txt
@@ -1,38 +1,35 @@
 set(indicator_SRCS
     main.cpp
     deviceindicator.cpp
 )
 
 include(ECMAddAppIcon)
 ecm_add_app_icon(indicator_SRCS ICONS
     ../icon/16-apps-kdeconnect.png
     ../icon/22-apps-kdeconnect.png
     ../icon/32-apps-kdeconnect.png
     ../icon/48-apps-kdeconnect.png
     ../icon/64-apps-kdeconnect.png
     ../icon/128-apps-kdeconnect.png
     ../icon/256-apps-kdeconnect.png
 )
 
 add_executable(kdeconnect-indicator ${indicator_SRCS})
 target_include_directories(kdeconnect-indicator PUBLIC ${CMAKE_BINARY_DIR})
 target_link_libraries(kdeconnect-indicator Qt5::Widgets KF5::CoreAddons KF5::I18n KF5::Notifications KF5::DBusAddons KF5::KCMUtils kdeconnectinterfaces kdeconnectcore)
-if (APPLE)
-    target_link_libraries(kdeconnect-indicator "-framework CoreFoundation")
-endif()
 if (WIN32)
     add_compile_definitions(QSYSTRAY)
 endif()
 
 if (APPLE)
 # Apple app package
 set_target_properties(kdeconnect-indicator PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
 set_target_properties(kdeconnect-indicator PROPERTIES
     MACOSX_BUNDLE_BUNDLE_NAME "KDE Connect"
     MACOSX_BUNDLE_LONG_VERSION_STRING "${KDECONNECT_VERSION_STRING}"
     MACOSX_BUNDLE_SHORT_VERSION_STRING "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}.${KDECONNECT_VERSION_PATCH}"
     MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.kdeconnect")
 endif()
 
 install(TARGETS kdeconnect-indicator ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(PROGRAMS org.kde.kdeconnect.nonplasma.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
diff --git a/indicator/main.cpp b/indicator/main.cpp
index 5cef0a78..f54fe7c9 100644
--- a/indicator/main.cpp
+++ b/indicator/main.cpp
@@ -1,203 +1,217 @@
 /*
  * Copyright 2016 Aleix Pol Gonzalez <aleixpol@kde.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <QApplication>
 #include <QProcess>
 #include <QThread>
 #include <QMessageBox>
 
 #ifdef QSYSTRAY
 #include <QSystemTrayIcon>
 #else
 #include <KStatusNotifierItem>
 #endif
 
 #include <KDBusService>
 #include <KAboutData>
 #include <KCMultiDialog>
 #include <KLocalizedString>
 
 #include "interfaces/devicesmodel.h"
 #include "interfaces/dbusinterfaces.h"
 #include "kdeconnect-version.h"
 #include "deviceindicator.h"
 
-#ifdef Q_OS_MAC
-#include <CoreFoundation/CFBundle.h>
-#endif
-
 #include <dbushelper.h>
 
 int main(int argc, char** argv)
 {
     QApplication app(argc, argv);
     KAboutData about(QStringLiteral("kdeconnect-indicator"),
                      i18n("KDE Connect Indicator"),
                      QStringLiteral(KDECONNECT_VERSION_STRING),
                      i18n("KDE Connect Indicator tool"),
                      KAboutLicense::GPL,
                      i18n("(C) 2016 Aleix Pol Gonzalez"));
     KAboutData::setApplicationData(about);
 
 #ifdef Q_OS_WIN
     QProcess kdeconnectd;
     kdeconnectd.start(QStringLiteral("kdeconnectd.exe"));
 #endif
 
 #ifdef Q_OS_MAC
     // Unset launchctl env, avoid block
     DbusHelper::macosUnsetLaunchctlEnv();
-
-    // Get bundle path
-    CFURLRef url = (CFURLRef)CFAutorelease((CFURLRef)CFBundleCopyBundleURL(CFBundleGetMainBundle()));
-    QString basePath = QUrl::fromCFURL(url).path();
-
+    
     // Start kdeconnectd
     QProcess kdeconnectdProcess;
-    kdeconnectdProcess.startDetached(basePath + QStringLiteral("Contents/MacOS/kdeconnectd"));
+    if (QFile::exists(QCoreApplication::applicationDirPath() + QStringLiteral("/kdeconnectd"))) {
+        kdeconnectdProcess.startDetached(QCoreApplication::applicationDirPath() + QStringLiteral("/kdeconnectd"));
+    } else if (QFile::exists(QString::fromLatin1(qgetenv("craftRoot")) + QStringLiteral("/../lib/libexec/kdeconnectd"))) {
+        kdeconnectdProcess.startDetached(QString::fromLatin1(qgetenv("craftRoot")) + QStringLiteral("/../lib/libexec/kdeconnectd"));
+    } else {
+        QMessageBox::critical(nullptr, i18n("KDE Connect"),
+                              i18n("Cannot find kdeconnectd"),
+                              QMessageBox::Abort,
+                              QMessageBox::Abort);
+        return -1;
+    }
 
     // Wait for dbus daemon env
     QProcess getLaunchdDBusEnv;
     int retry = 0;
     do {
         getLaunchdDBusEnv.setProgram(QStringLiteral("launchctl"));
         getLaunchdDBusEnv.setArguments({
             QStringLiteral("getenv"),
             QStringLiteral(KDECONNECT_SESSION_DBUS_LAUNCHD_ENV)
         });
         getLaunchdDBusEnv.start();
         getLaunchdDBusEnv.waitForFinished();
 
         QString launchdDBusEnv = QString::fromLocal8Bit(getLaunchdDBusEnv.readAllStandardOutput());
 
         if (launchdDBusEnv.length() > 0) {
             break;
         } else if (retry >= 10) {
             // Show a warning and exit
             qCritical() << "Fail to get launchctl" << KDECONNECT_SESSION_DBUS_LAUNCHD_ENV << "env";
 
             QMessageBox::critical(nullptr, i18n("KDE Connect"),
                                   i18n("Cannot connect to DBus\n"
                                   "KDE Connect will quit"),
                                   QMessageBox::Abort,
                                   QMessageBox::Abort);
 
             return -1;
         } else {
             QThread::sleep(1);  // Retry after 1s
             retry++;
         }
     } while(true);
 #endif
 
     KDBusService dbusService(KDBusService::Unique);
 
     DevicesModel model;
     model.setDisplayFilter(DevicesModel::Reachable | DevicesModel::Paired);
     QMenu* menu = new QMenu;
 
     DaemonDbusInterface iface;
     auto refreshMenu = [&iface, &model, &menu]() {
         menu->clear();
         auto configure = menu->addAction(QIcon::fromTheme(QStringLiteral("configure")), i18n("Configure..."));
         QObject::connect(configure, &QAction::triggered, configure, [](){
             KCMultiDialog* dialog = new KCMultiDialog;
             dialog->addModule(QStringLiteral("kcm_kdeconnect"));
             dialog->setAttribute(Qt::WA_DeleteOnClose);
             dialog->show();
         });
         for (int i=0, count = model.rowCount(); i<count; ++i) {
             DeviceDbusInterface* device = model.getDevice(i);
             auto indicator = new DeviceIndicator(device);
             QObject::connect(device, &DeviceDbusInterface::destroyed, indicator, &QObject::deleteLater);
 
             menu->addMenu(indicator);
         }
         const QStringList requests = iface.pairingRequests();
         if (!requests.isEmpty()) {
             menu->addSection(i18n("Pairing requests"));
 
             for(const auto& req: requests) {
                 DeviceDbusInterface* dev = new DeviceDbusInterface(req, menu);
                 auto pairMenu = menu->addMenu(dev->name());
                 pairMenu->addAction(i18n("Pair"), dev, &DeviceDbusInterface::acceptPairing);
                 pairMenu->addAction(i18n("Reject"), dev, &DeviceDbusInterface::rejectPairing);
             }
         }
 
 #if (defined Q_OS_MAC || defined Q_OS_WIN)
         // Add quit menu
         menu->addAction(i18n("Quit"), [](){
             auto message = QDBusMessage::createMethodCall(QStringLiteral("org.kde.kdeconnect.daemon"),
                                                         QStringLiteral("/MainApplication"),
                                                         QStringLiteral("org.qtproject.Qt.QCoreApplication"),
                                                         QStringLiteral("quit"));
             DbusHelper::sessionBus().call(message);
             QCoreApplication::quit();   // Close this application
         });
 #endif
     };
 
     QObject::connect(&iface, &DaemonDbusInterface::pairingRequestsChangedProxy, &model, refreshMenu);
     QObject::connect(&model, &DevicesModel::rowsInserted, &model, refreshMenu);
     QObject::connect(&model, &DevicesModel::rowsRemoved, &model, refreshMenu);
 
 #ifdef Q_OS_MAC
-    QStringList themeSearchPaths = QIcon::themeSearchPaths();
-    themeSearchPaths << basePath + QStringLiteral("Contents/Resources/icons/");
-    QIcon::setThemeSearchPaths(themeSearchPaths);
+    const QString iconPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("icons"), QStandardPaths::LocateDirectory);
+    if (!iconPath.isNull()) {
+        QStringList themeSearchPaths = QIcon::themeSearchPaths();
+        themeSearchPaths << iconPath;
+        QIcon::setThemeSearchPaths(themeSearchPaths);
+    }
 #endif
 
 #ifdef QSYSTRAY
     QSystemTrayIcon systray;
 #ifdef Q_OS_WIN
     systray.setIcon(QIcon(QStandardPaths::locate(QStandardPaths::AppLocalDataLocation, QStringLiteral("icons/hicolor/scalable/apps/kdeconnectindicatorwin.svg"))));
 #else
     systray.setIcon(QIcon::fromTheme(QStringLiteral("kdeconnectindicatordark")));
 #endif
     systray.setVisible(true);
     systray.setToolTip(QStringLiteral("KDE Connect"));
     QObject::connect(&model, &DevicesModel::rowsChanged, &model, [&systray, &model]() {
         systray.setToolTip(i18np("%1 device connected", "%1 devices connected", model.rowCount()));
     });
 
     systray.setContextMenu(menu);
 #else
     KStatusNotifierItem systray;
+#ifdef Q_OS_MAC
+    if (!iconPath.isNull()) {
+        systray.setIconByName(QStringLiteral("kdeconnectindicatordark"));
+    } else {
+        // We are in macOS dev env, just continue
+        qWarning() << "Fail to find indicator icon, continue anyway";
+    }
+#else
     systray.setIconByName(QStringLiteral("kdeconnectindicatordark"));
+#endif
     systray.setToolTip(QStringLiteral("kdeconnect"), QStringLiteral("KDE Connect"), QStringLiteral("KDE Connect"));
     systray.setCategory(KStatusNotifierItem::Communications);
     systray.setStatus(KStatusNotifierItem::Passive);
     systray.setStandardActionsEnabled(false);
     QObject::connect(&model, &DevicesModel::rowsChanged, &model, [&systray, &model]() {
         const auto count = model.rowCount();
         systray.setStatus(count == 0 ? KStatusNotifierItem::Passive : KStatusNotifierItem::Active);
         systray.setToolTip(QStringLiteral("kdeconnect"), QStringLiteral("KDE Connect"), i18np("%1 device connected", "%1 devices connected", count));
     });
 
     systray.setContextMenu(menu);
 #endif
 
     refreshMenu();
 
     app.setQuitOnLastWindowClosed(false);
 
     return app.exec();
 }