diff --git a/nymea-app/main.cpp b/nymea-app/main.cpp
index 54ff0894..d51b0f8f 100644
--- a/nymea-app/main.cpp
+++ b/nymea-app/main.cpp
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
     }
 
     QFont applicationFont;
-    applicationFont.setFamily("Ubuntu");
+//    applicationFont.setFamily("Oswald");
     applicationFont.setCapitalization(QFont::MixedCase);
     applicationFont.setPixelSize(16);
     applicationFont.setWeight(QFont::Normal);
diff --git a/nymea-app/resources.qrc b/nymea-app/resources.qrc
index 4e25a7e4..a4bcf29c 100644
--- a/nymea-app/resources.qrc
+++ b/nymea-app/resources.qrc
@@ -166,5 +166,11 @@
         <file>ui/connection/CertificateDialog.qml</file>
         <file>ui/experiences/garagegates/Main.qml</file>
         <file>ui/experiences/heating/Main.qml</file>
+        <file>ui/fonts/Oswald-Bold.ttf</file>
+        <file>ui/fonts/Oswald-ExtraLight.ttf</file>
+        <file>ui/fonts/Oswald-Light.ttf</file>
+        <file>ui/fonts/Oswald-Medium.ttf</file>
+        <file>ui/fonts/Oswald-Regular.ttf</file>
+        <file>ui/fonts/Oswald-SemiBold.ttf</file>
     </qresource>
 </RCC>
diff --git a/nymea-app/styles.qrc b/nymea-app/styles.qrc
index 347c12f5..f6b0e151 100644
--- a/nymea-app/styles.qrc
+++ b/nymea-app/styles.qrc
@@ -3,10 +3,14 @@
         <file>styles/light/ApplicationWindow.qml</file>
         <file>styles/light/Page.qml</file>
         <file>styles/light/logo.svg</file>
+        <file>styles/light/Button.qml</file>
         <file>styles/dark/ApplicationWindow.qml</file>
         <file>styles/dark/Page.qml</file>
         <file>styles/dark/logo.svg</file>
         <file>styles/dark/Button.qml</file>
-        <file>styles/light/Button.qml</file>
+        <file>styles/noir/ApplicationWindow.qml</file>
+        <file>styles/noir/Page.qml</file>
+        <file>styles/noir/logo.svg</file>
+        <file>styles/noir/Button.qml</file>
     </qresource>
 </RCC>
diff --git a/nymea-app/ui/Nymea.qml b/nymea-app/ui/Nymea.qml
index bd342dee..e0250a5f 100644
--- a/nymea-app/ui/Nymea.qml
+++ b/nymea-app/ui/Nymea.qml
@@ -14,7 +14,7 @@ ApplicationWindow {
     minimumWidth: 360
     minimumHeight: 480
     visibility: ApplicationWindow.AutomaticVisibility
-    font: Qt.application.font
+//    font: Qt.application.font
 
 
     // Those variables must be present in the Style
diff --git a/nymea-app/ui/components/Led.qml b/nymea-app/ui/components/Led.qml
index f7dcdce1..d48c4791 100644
--- a/nymea-app/ui/components/Led.qml
+++ b/nymea-app/ui/components/Led.qml
@@ -16,6 +16,7 @@ Item {
         color: {
             switch (root.state) {
             case "on":
+                return app.accentColor
             case "green":
                 return "#73c0b3";
             case "off":
diff --git a/nymea-app/ui/experiences/heating/Main.qml b/nymea-app/ui/experiences/heating/Main.qml
index 200dd5d2..30d40ac6 100644
--- a/nymea-app/ui/experiences/heating/Main.qml
+++ b/nymea-app/ui/experiences/heating/Main.qml
@@ -8,7 +8,7 @@ import QtGraphicalEffects 1.0
 
 Item {
     id: root
-    readonly property string title: qsTr("Heating")
+    readonly property string title: qsTr("Celsi°s")
     readonly property string icon: Qt.resolvedUrl("qrc:/ui/images/radiator.svg")
 
     readonly property Device duwWpDevice: duwWpFilterModel.count > 0 ? duwWpFilterModel.get(0) : null
@@ -158,10 +158,10 @@ Item {
                             if (!root.co2LevelState) {
                                 return "off"
                             }
-                            if (root.co2LevelState.value < 900) {
+                            if (root.co2LevelState.value < 600) {
                                 return "green"
                             }
-                            if (root.co2LevelState.value < 2000) {
+                            if (root.co2LevelState.value < 1200) {
                                 return "orange"
                             }
                             return "red"
@@ -184,7 +184,7 @@ Item {
                     Label {
                         text: root.temperatureState ? root.temperatureState.value.toFixed(1) + "°C" : "N/A"
                         Layout.fillWidth: true
-                        font.pixelSize: app.largeFont * 2
+                        font.pixelSize: app.largeFont * 1.5
                     }
                 }
             }
@@ -198,19 +198,20 @@ Item {
                 Label {
                     text: (d.pendingCallId !== -1 || d.setTempPending) ? d.queuedTargetTemp.toFixed(1) :
                         root.targetTemperatureState ? root.targetTemperatureState.value.toFixed(1) : "N/A"
-                    font.pixelSize: app.largeFont * 4
+                    font.pixelSize: app.largeFont * 3
                 }
             }
 
 
             ColumnLayout {
                 Layout.fillWidth: false
+                Layout.bottomMargin: app.margins
                 ColorIcon {
-                    Layout.preferredHeight: app.iconSize * 1.5
+                    Layout.preferredHeight: app.iconSize //* 1.5
                     Layout.preferredWidth: height
                     Layout.alignment: Qt.AlignHCenter
                     color: app.accentColor
-                    name: "qrc:/ui/images/share.svg"
+                    name: "qrc:/ui/images/magic.svg"
                     MouseArea {
                         anchors.fill: parent
                         onClicked: pageStack.push("qrc:/ui/magic/DeviceRulesPage.qml", {device: root.duwWpDevice})
diff --git a/nymea-app/ui/fonts/Oswald-Bold.ttf b/nymea-app/ui/fonts/Oswald-Bold.ttf
new file mode 100644
index 00000000..c7307b0b
Binary files /dev/null and b/nymea-app/ui/fonts/Oswald-Bold.ttf differ
diff --git a/nymea-app/ui/fonts/Oswald-ExtraLight.ttf b/nymea-app/ui/fonts/Oswald-ExtraLight.ttf
new file mode 100644
index 00000000..5662aad7
Binary files /dev/null and b/nymea-app/ui/fonts/Oswald-ExtraLight.ttf differ
diff --git a/nymea-app/ui/fonts/Oswald-Light.ttf b/nymea-app/ui/fonts/Oswald-Light.ttf
new file mode 100644
index 00000000..264872d2
Binary files /dev/null and b/nymea-app/ui/fonts/Oswald-Light.ttf differ
diff --git a/nymea-app/ui/fonts/Oswald-Medium.ttf b/nymea-app/ui/fonts/Oswald-Medium.ttf
new file mode 100644
index 00000000..d060d7ea
Binary files /dev/null and b/nymea-app/ui/fonts/Oswald-Medium.ttf differ
diff --git a/nymea-app/ui/fonts/Oswald-Regular.ttf b/nymea-app/ui/fonts/Oswald-Regular.ttf
new file mode 100644
index 00000000..e9976cc3
Binary files /dev/null and b/nymea-app/ui/fonts/Oswald-Regular.ttf differ
diff --git a/nymea-app/ui/fonts/Oswald-SemiBold.ttf b/nymea-app/ui/fonts/Oswald-SemiBold.ttf
new file mode 100644
index 00000000..9183e926
Binary files /dev/null and b/nymea-app/ui/fonts/Oswald-SemiBold.ttf differ