diff --git a/QtZeroConf b/QtZeroConf
index 2990b858..09116a9b 160000
--- a/QtZeroConf
+++ b/QtZeroConf
@@ -1 +1 @@
-Subproject commit 2990b858e6334fae4dd37a77c770336bd6e1b2d9
+Subproject commit 09116a9bf84082688e9f2cd24cfd08788c71650c
diff --git a/libnymea-app-core/libnymea-app-core.pro b/libnymea-app-core/libnymea-app-core.pro
index 770170f2..451e2091 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:!ubuntu: {
+!win32: {
     # To enable this on Windows we'd need to install Bonjour
     # https://support.apple.com/kb/DL999
     DEFINES += QZEROCONF_STATIC
diff --git a/manifest.json b/manifest.json
index 7aad3569..23ae010d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "io.guh.nymeaapp",
-    "description": "blabla",
+    "description": "nymea:app is a client for nymea - a professional IoT server that allows to link smart devices and services. Functional relations of all available sensing and acting capabilities can be defined by 'Magic'.",
     "architecture": "armhf",
     "title": "nymea:app",
     "hooks": {
@@ -9,7 +9,7 @@
             "desktop":  "nymea-app.desktop"
         }
     },
-    "version": "1.0.0",
-    "maintainer": "Your FullName <email@domain.org>",
+    "version": "1.0.75",
+    "maintainer": "Michael Zanetti <michael.zanetti@nymea.io>",
     "framework" : "ubuntu-sdk-15.04.5"
 }
diff --git a/nymea-app.apparmor b/nymea-app.apparmor
index 7a0a3253..437a2219 100644
--- a/nymea-app.apparmor
+++ b/nymea-app.apparmor
@@ -1,5 +1,5 @@
 {
     "template": "unconfined",
-    "policy_groups": [],
+    "policy_groups": ["networking"],
     "policy_version": 1.3
 }
diff --git a/nymea-app/main.cpp b/nymea-app/main.cpp
index acd34812..b317e307 100644
--- a/nymea-app/main.cpp
+++ b/nymea-app/main.cpp
@@ -56,15 +56,6 @@ 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);
diff --git a/nymea-app/ui/components/FancyHeader.qml b/nymea-app/ui/components/FancyHeader.qml
index 33de4258..bfe5ac1d 100644
--- a/nymea-app/ui/components/FancyHeader.qml
+++ b/nymea-app/ui/components/FancyHeader.qml
@@ -106,6 +106,7 @@ ToolBar {
                         ColumnLayout {
                             anchors.fill: parent
                             anchors.margins: app.margins / 2
+                            spacing: 0
                             ColorIcon {
                                 name: model.iconSource
                                 Layout.preferredHeight: app.iconSize
diff --git a/nymea-app/ui/components/MainPageTabButton.qml b/nymea-app/ui/components/MainPageTabButton.qml
index b7aa8fe8..ac2c6c59 100644
--- a/nymea-app/ui/components/MainPageTabButton.qml
+++ b/nymea-app/ui/components/MainPageTabButton.qml
@@ -16,6 +16,7 @@ TabButton {
 
     contentItem: GridLayout {
         columns: root.alignment === Qt.Vertical ? 1 : 2
+        rowSpacing: 4
         ColorIcon {
             Layout.preferredWidth: app.iconSize
             Layout.preferredHeight: app.iconSize