diff --git a/apps.json b/apps.json
index b9dc4126b..63f3e4954 100644
--- a/apps.json
+++ b/apps.json
@@ -4749,7 +4749,7 @@
   {
     "id": "weatherClock",
     "name": "Weather Clock",
-    "version": "0.03",
+    "version": "0.04",
     "description": "A clock which displays current weather conditions (requires Gadgetbridge and Weather apps).",
     "icon": "app.png",
     "screenshots": [{"url":"screens/screen1.png"}],
diff --git a/apps/weatherClock/ChangeLog b/apps/weatherClock/ChangeLog
index 600f93be2..72b53ebbf 100644
--- a/apps/weatherClock/ChangeLog
+++ b/apps/weatherClock/ChangeLog
@@ -1,3 +1,4 @@
 0.01: New App!
 0.02: Minor layout format tweak so it uses less memory and draws ok on Bangle.js 1 (#1012)
 0.03: Minor layout extra spaces.
+0.04: Layout now compatible with Bangle.js 2
diff --git a/apps/weatherClock/app.js b/apps/weatherClock/app.js
index 9dd49427f..799f9abc6 100644
--- a/apps/weatherClock/app.js
+++ b/apps/weatherClock/app.js
@@ -73,12 +73,10 @@ var clockLayout = new Layout( {
       {type: "img", filly: 1, id: "weatherIcon", src: sunIcon},
       {type: "v", fillx:1, c: [
           {type: "h", c: [
-            {type: "txt", font: "10%", id: "temp", label: "000"},
-            {type: "txt", font: "10%", id: "tempUnit", label: "°C"},
+            {type: "txt", font: "10%", id: "temp", label: "000 °C"},
           ]},
           {type: "h", c: [
-            {type: "txt", font: "10%", id: "wind",  label: "00"},
-            {type: "txt", font: "10%", id: "windUnit", label: "km/h"},
+            {type: "txt", font: "10%", id: "wind", label: "00 km/h"},
           ]}
         ]
       },
@@ -106,18 +104,14 @@ function draw() {
   if(weatherJson && weatherJson.weather){
       var currentWeather = weatherJson.weather;
       const temp = locale.temp(currentWeather.temp-273.15).match(/^(\D*\d*)(.*)$/);
-      clockLayout.temp.label = temp[1];
-      clockLayout.tempUnit.label = temp[2];
+      clockLayout.temp.label = temp[1] + " " + temp[2];
       clockLayout.weatherIcon.src = chooseIcon(currentWeather.txt);
       const wind = locale.speed(currentWeather.wind).match(/^(\D*\d*)(.*)$/);
-      clockLayout.wind.label = wind[1] + " ".repeat(wind[2].length-1);
-      clockLayout.windUnit.label = wind[2] + " " + (currentWeather.wrose||'').toUpperCase();
+      clockLayout.wind.label = wind[1] + " " + wind[2] + " " + (currentWeather.wrose||'').toUpperCase();
   }
   else{
       clockLayout.temp.label = "Err";
-      clockLayout.tempUnit.label = "";
       clockLayout.wind.label = "No Data";
-      clockLayout.windUnit.label = "";
       clockLayout.weatherIcon.src = errIcon;
   }
   clockLayout.clear();