diff --git a/apps/bwclk/ChangeLog b/apps/bwclk/ChangeLog
index 11569af0c..89fcea519 100644
--- a/apps/bwclk/ChangeLog
+++ b/apps/bwclk/ChangeLog
@@ -3,4 +3,5 @@
 0.03: Adapt colors based on the theme of the user.
 0.04: Steps can be hidden now such that the time is even larger.
 0.05: Included icons for information.
-0.06: Design and usability improvements.
\ No newline at end of file
+0.06: Design and usability improvements.
+0.07: Improved positioning.
\ No newline at end of file
diff --git a/apps/bwclk/app.js b/apps/bwclk/app.js
index 5240e69ec..0fe71b240 100644
--- a/apps/bwclk/app.js
+++ b/apps/bwclk/app.js
@@ -259,11 +259,12 @@ function draw() {
 
 function drawDate(){
     // Draw background
-    var y = H/5*2 + (settings.fullscreen ? 0 : 8);
+    var y = H/5*2;
     g.reset().clearRect(0,0,W,W);
 
     // Draw date
-    y -= settings.fullscreen ? 8 : 0;
+    y = parseInt(y/2);
+    y += settings.fullscreen ? 0 : 15;
     var date = new Date();
     var dateStr = date.getDate();
     dateStr = ("0" + dateStr).substr(-2);
@@ -276,14 +277,14 @@ function drawDate(){
     var dayW = Math.max(g.stringWidth(dayStr), g.stringWidth(monthStr));
     var fullDateW = dateW + 10 + dayW;
 
-    g.setFontAlign(-1,1);
+    g.setFontAlign(-1,0);
     g.setMediumFont();
     g.setColor(g.theme.fg);
     g.drawString(dateStr, W/2 - fullDateW / 2, y+5);
 
     g.setSmallFont();
-    g.drawString(monthStr, W/2 - fullDateW/2 + 10 + dateW, y+3);
-    g.drawString(dayStr, W/2 - fullDateW/2 + 10 + dateW, y-23);
+    g.drawString(monthStr, W/2 - fullDateW/2 + 10 + dateW, y+14);
+    g.drawString(dayStr, W/2 - fullDateW/2 + 10 + dateW, y-10);
 }
 
 
@@ -296,9 +297,9 @@ function drawTime(){
 
   // Draw time
   g.setColor(g.theme.bg);
-  g.setFontAlign(0,-1);
+  g.setFontAlign(0,0);
   var timeStr = locale.time(date,1);
-  y += settings.fullscreen ? 14 : 10;
+  y += parseInt((H - y)/2) + 5;
 
   var infoEntry = getInfoEntry();
   var infoStr = infoEntry[0];
@@ -307,9 +308,9 @@ function drawTime(){
 
   // Show large or small time depending on info entry
   if(infoStr == null){
-    y += 10;
     g.setLargeFont();
   } else {
+    y -= 15;
     g.setMediumFont();
   }
   g.drawString(timeStr, W/2, y);
@@ -319,7 +320,7 @@ function drawTime(){
     return;
   }
 
-  y += H/5*2-5;
+  y += 35;
   g.setFontAlign(0,0);
   g.setSmallFont();
   var imgWidth = 0;
diff --git a/apps/bwclk/metadata.json b/apps/bwclk/metadata.json
index 8b13cd256..59d044eb3 100644
--- a/apps/bwclk/metadata.json
+++ b/apps/bwclk/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "bwclk",
   "name": "BW Clock",
-  "version": "0.06",
+  "version": "0.07",
   "description": "BW Clock.",
   "readme": "README.md",
   "icon": "app.png",