diff --git a/apps/circlesclock/app.js b/apps/circlesclock/app.js
index 58055e96e..686de735b 100644
--- a/apps/circlesclock/app.js
+++ b/apps/circlesclock/app.js
@@ -2,6 +2,7 @@ const locale = require("locale");
 const heatshrink = require("heatshrink");
 
 const shoesIcon = heatshrink.decompress(atob("h0OwYJGgmAAgUBkgECgVJB4cSoAUDyEBkARDpADBhMAyQRBgVAkgmDhIUDAAuQAgY1DAAYA="));
+const shoesIconGreen = heatshrink.decompress(atob("h0OwYJGhIEDgVIAgUEyQKDkmACgcggVACIeQAYMSgIRCgmApIbDiQUDAAkBkAFDGoYAD"));
 const heartIcon = heatshrink.decompress(atob("h0OwYOLkmQhMkgACByVJgESpIFBpEEBAIFBCgIFCCgsABwcAgQOCAAMSpAwDyBNM"));
 const powerIcon = heatshrink.decompress(atob("h0OwYQNsAED7AEDmwEDtu2AgUbtuABwXbBIUN23AAoYOCgEDFIgODABI"));
 const powerIconGreen = heatshrink.decompress(atob("h0OwYQNkAEDpAEDiQEDkmSAgUJkmABwVJBIUEyVAAoYOCgEBFIgODABI"));
@@ -96,7 +97,7 @@ function drawCircle(index, defaultType) {
 function getCirclePosition(type, defaultPos) {
   for (let i = 1; i <= 3; i++) {
     const setting = settings['circle' + i];
-    if (setting == type) return i;
+    if (setting == type) return i == 1 ? w1: i == 2 ? w2 : w3;
   }
   return defaultPos;
 }
@@ -157,7 +158,7 @@ function drawStepsDistance(w) {
   g.setColor(colorFg);
   g.drawString(shortValue(stepsDistance), w + 2, h3);
 
-  g.drawImage(shoesIcon, w - 6, h3 + radiusOuter - 6);
+  g.drawImage(shoesIconGreen, w - 6, h3 + radiusOuter - 6);
 }
 
 function drawHeartRate(w) {
diff --git a/apps/circlesclock/settings.js b/apps/circlesclock/settings.js
index 754fa0c69..3ddacd29c 100644
--- a/apps/circlesclock/settings.js
+++ b/apps/circlesclock/settings.js
@@ -7,7 +7,7 @@
     storage.write(SETTINGS_FILE, settings);
   }
   var valuesCircleTypes = ["steps", "stepsDist", "hr", "battery"];
-  var namesCircleTypes = ["steps", "step distance", "heart", "battery"];
+  var namesCircleTypes = ["steps", "distance", "heart", "battery"];
   E.showMenu({
     '': { 'title': 'circlesclock' },
     'min heartrate': {
@@ -40,7 +40,7 @@
       },
       onchange: x => save('stepGoal', x),
     },
-    'battery warn lvl': {
+    'battery warn': {
       value: "batteryWarn" in settings ? settings.batteryWarn : 30,
       min: 10,
       max : 100,
@@ -58,7 +58,7 @@
         save('showWidgets', settings.showWidgets);
       },
     },
-    'Left circle': {
+    'left': {
       value: Math.max(0,0 | valuesCircleTypes.indexOf(settings.circle1)),
       min: 0, max: 3,
       format: v => namesCircleTypes[v],
@@ -67,8 +67,8 @@
         save('circle1', settings.circle1);
       }
     },
-    'Middle circle': {
-      value: Math.max(0,0 | valuesCircleTypes.indexOf(settings.circle2)),
+    'middle': {
+      value: Math.max(0,2 | valuesCircleTypes.indexOf(settings.circle2)),
       min: 0, max: 3,
       format: v => namesCircleTypes[v],
       onchange: v => {
@@ -76,8 +76,8 @@
         save('circle2', settings.circle2);
       }
     },
-    'Right circle': {
-      value: Math.max(0,0 | valuesCircleTypes.indexOf(settings.circle3)),
+    'right': {
+      value: Math.max(0,3 | valuesCircleTypes.indexOf(settings.circle3)),
       min: 0, max: 3,
       format: v => namesCircleTypes[v],
       onchange: v => {