diff --git a/.gitmodules b/.gitmodules
index 81790a01..3e4d5c9e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "-f"]
-	path = -f
-	url = https://github.com/mzanetti/QtZeroConf.git
 [submodule "QtZeroConf"]
 	path = QtZeroConf
-	url = https://github.com/jbagg/QtZeroConf.git
+	url = https://github.com/jbagg/QtZeroConf.git
\ No newline at end of file
diff --git a/nymea-app/ui/Nymea.qml b/nymea-app/ui/Nymea.qml
index a642c2f4..6073cb59 100644
--- a/nymea-app/ui/Nymea.qml
+++ b/nymea-app/ui/Nymea.qml
@@ -17,6 +17,7 @@ ApplicationWindow {
 
     property int margins: 14
     property int bigMargins: 20
+    property int extraSmallFont: 10
     property int smallFont: 13
     property int mediumFont: 16
     property int largeFont: 20
diff --git a/nymea-app/ui/components/FancyHeader.qml b/nymea-app/ui/components/FancyHeader.qml
index 8e1e16af..4aebfd81 100644
--- a/nymea-app/ui/components/FancyHeader.qml
+++ b/nymea-app/ui/components/FancyHeader.qml
@@ -30,9 +30,9 @@ ToolBar {
             Layout.fillHeight: true
             Layout.margins: app.margins
             verticalAlignment: Text.AlignVCenter
-            font.pixelSize: app.largeFont
+            font.pixelSize: app.mediumFont
             elide: Text.ElideRight
-            text: root.title
+            text: root.title.toLowerCase();
         }
 
         HeaderButton {
@@ -55,9 +55,9 @@ ToolBar {
             Layout.fillHeight: true
             Layout.margins: app.margins
             verticalAlignment: Text.AlignVCenter
-            font.pixelSize: app.largeFont
+            font.pixelSize: app.mediumFont
             elide: Text.ElideRight
-            text: qsTr("Menu")
+            text: qsTr("menu")
         }
 
         HeaderButton {
@@ -115,7 +115,7 @@ ToolBar {
                                 elide: Text.ElideRight
                                 horizontalAlignment: Text.AlignHCenter
                                 verticalAlignment: Text.AlignVCenter
-                                font.pixelSize: app.smallFont - 2
+                                font.pixelSize: app.extraSmallFont
                             }
                         }
                     }
diff --git a/nymea-app/ui/components/GuhHeader.qml b/nymea-app/ui/components/GuhHeader.qml
index 41aea2ef..63c3daf2 100644
--- a/nymea-app/ui/components/GuhHeader.qml
+++ b/nymea-app/ui/components/GuhHeader.qml
@@ -38,9 +38,9 @@ ToolBar {
             Layout.fillWidth: true
             Layout.fillHeight: true
             verticalAlignment: Text.AlignVCenter
-            font.pixelSize: app.largeFont
+            font.pixelSize: app.mediumFont
             elide: Text.ElideRight
-            text: root.text.toUpperCase()
+            text: root.text.toLowerCase();
         }
     }
 }
diff --git a/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml b/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml
index bef784c5..4274b3c4 100644
--- a/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml
+++ b/nymea-app/ui/devicelistpages/GenericDeviceListPage.qml
@@ -19,7 +19,7 @@ Page {
     header: GuhHeader {
         text: {
             if (subPage.shownInterfaces.length === 1) {
-                return qsTr("My %1").arg(interfaceToString(subPage.shownInterfaces[0]))
+                return qsTr("My %1").arg(app.interfaceToString(subPage.shownInterfaces[0]))
             } else if (subPage.shownInterfaces.length > 1 || subPage.hiddenInterfaces.length > 0) {
                 return qsTr("My things")
             }
diff --git a/nymea-app/ui/mainviews/DevicesPage.qml b/nymea-app/ui/mainviews/DevicesPage.qml
index fbaa2f5b..7eca6603 100644
--- a/nymea-app/ui/mainviews/DevicesPage.qml
+++ b/nymea-app/ui/mainviews/DevicesPage.qml
@@ -24,7 +24,7 @@ Item {
             devices: Engine.deviceManager.devices
         }
         cellWidth: width / tilesPerRow
-        cellHeight: Math.max(cellWidth, minTileHeight)
+        cellHeight: cellWidth
         delegate: DevicesPageDelegate {
             width: interfacesGridView.cellWidth
             height: interfacesGridView.cellHeight
diff --git a/nymea-app/ui/mainviews/DevicesPageDelegate.qml b/nymea-app/ui/mainviews/DevicesPageDelegate.qml
index 6029b527..321bdee0 100644
--- a/nymea-app/ui/mainviews/DevicesPageDelegate.qml
+++ b/nymea-app/ui/mainviews/DevicesPageDelegate.qml
@@ -18,7 +18,7 @@ Item {
             anchors.verticalCenterOffset: -app.iconSize
             spacing: app.margins
             ColorIcon {
-                height: app.iconSize * 2
+                height: app.iconSize * 1.3
                 width: height
                 color: app.guhAccent
                 anchors.horizontalCenter: parent.horizontalCenter
@@ -27,6 +27,9 @@ Item {
 
             Label {
                 text: interfaceToString(model.name).toUpperCase()
+                font.pixelSize: app.extraSmallFont
+                font.bold: true
+                font.letterSpacing: 1
                 width: parent.width
                 horizontalAlignment: Text.AlignHCenter
                 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
@@ -69,7 +72,6 @@ Item {
             color: "black"
             opacity: .05
         }
-
         Loader {
             id: inlineControlLoader
             anchors {
diff --git a/nymea-app/ui/mainviews/FavoritesView.qml b/nymea-app/ui/mainviews/FavoritesView.qml
index 747b6550..9436c80f 100644
--- a/nymea-app/ui/mainviews/FavoritesView.qml
+++ b/nymea-app/ui/mainviews/FavoritesView.qml
@@ -119,7 +119,7 @@ Item {
                     spacing: app.margins
 
                     ColorIcon {
-                        Layout.preferredWidth: app.iconSize * 2
+                        Layout.preferredWidth: app.iconSize * 1.3
                         Layout.preferredHeight: width
                         name: app.interfacesToIcon(delegateRoot.deviceClass.interfaces)
                         color: app.guhAccent
@@ -128,7 +128,10 @@ Item {
 
                     Label {
                         Layout.fillWidth: true
-                        text: delegateRoot.device.name
+                        text: delegateRoot.device.name.toUpperCase()
+                        font.pixelSize: app.extraSmallFont
+                        font.bold: true
+                        font.letterSpacing: 1
                         wrapMode: Text.WordWrap
                         horizontalAlignment: Text.AlignHCenter
                     }
diff --git a/nymea-app/ui/mainviews/ScenesView.qml b/nymea-app/ui/mainviews/ScenesView.qml
index 53958ff7..c089f9cb 100644
--- a/nymea-app/ui/mainviews/ScenesView.qml
+++ b/nymea-app/ui/mainviews/ScenesView.qml
@@ -24,7 +24,7 @@ Item {
             filterExecutable: true
         }
         cellWidth: width / tilesPerRow
-        cellHeight: Math.max(cellWidth, minTileHeight)
+        cellHeight: cellWidth
         delegate: Item {
             id: scenesDelegate
             width: interfacesGridView.cellWidth
@@ -56,7 +56,7 @@ Item {
                         spacing: app.margins
 
                         ColorIcon {
-                            Layout.preferredHeight: app.iconSize * 2
+                            Layout.preferredHeight: app.iconSize * 1.3
                             Layout.preferredWidth: height
                             Layout.alignment: Qt.AlignHCenter
                             name: scenesDelegate.iconTag ? "../images/" + scenesDelegate.iconTag.value + ".svg" : "../images/slideshow.svg";
@@ -72,7 +72,10 @@ Item {
 
                         Label {
                             Layout.fillWidth: true
-                            text: model.name
+                            text: model.name.toUpperCase()
+                            font.pixelSize: app.extraSmallFont
+                            font.bold: true
+                            font.letterSpacing: 1
                             wrapMode: Text.WordWrap
                             horizontalAlignment: Text.AlignHCenter
                             maximumLineCount: 2