diff --git a/clickable.json b/clickable.json
index 254b9dc6..7b764a17 100644
--- a/clickable.json
+++ b/clickable.json
@@ -1,6 +1,7 @@
 {
   "template": "qmake",
-  "kill": "nymeaapp",
+  "kill": "nymea-app",
+  "build_args": "CONFIG+=ubuntu",
   "dependencies": [
     "libavahi-client-dev",
     "libavahi-common-dev"
diff --git a/libnymea-app-core/libnymea-app-core.pro b/libnymea-app-core/libnymea-app-core.pro
index 451e2091..770170f2 100644
--- a/libnymea-app-core/libnymea-app-core.pro
+++ b/libnymea-app-core/libnymea-app-core.pro
@@ -3,7 +3,7 @@ TEMPLATE = lib
 CONFIG += staticlib
 
 include(../config.pri)
-!win32: {
+!win32:!ubuntu: {
     # To enable this on Windows we'd need to install Bonjour
     # https://support.apple.com/kb/DL999
     DEFINES += QZEROCONF_STATIC
diff --git a/nymea-app.desktop b/nymea-app.desktop
index 8bb1664a..c96d1355 100644
--- a/nymea-app.desktop
+++ b/nymea-app.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=nymea:app
-Exec=nymeaapp
+Exec=usr/bin/nymea-app
 Icon=appicon.svg
 Terminal=false
 Type=Application
diff --git a/nymea-app.pro b/nymea-app.pro
index ee90a9cc..79416e12 100644
--- a/nymea-app.pro
+++ b/nymea-app.pro
@@ -1,6 +1,5 @@
 include(config.pri)
 message("APP_VERSION: $${APP_VERSION} ($${APP_REVISION})")
-
 TEMPLATE=subdirs
 
 SUBDIRS = libnymea-common libnymea-app-core nymea-app
diff --git a/nymea-app/main.cpp b/nymea-app/main.cpp
index b317e307..acd34812 100644
--- a/nymea-app/main.cpp
+++ b/nymea-app/main.cpp
@@ -56,6 +56,15 @@ QObject *platformHelperProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
 
 int main(int argc, char *argv[])
 {
+    QByteArray gridUnits = qgetenv("GRID_UNIT_PX");
+    qDebug() << "grid units" << gridUnits;
+    bool ok;
+    int gu = gridUnits.toInt(&ok);
+    if (ok && gu > 0) {
+        qreal scale = 1.0 * qRound(2.0 * gu / 8) / 2;
+        qDebug() << "Setting scale factor to" << scale;
+        qputenv("QT_SCALE_FACTOR", QByteArray::number(scale));
+    }
 
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QGuiApplication application(argc, argv);