diff --git a/apps/imageclock/app.js b/apps/imageclock/app.js
index 72f12943a..0cd7722ed 100644
--- a/apps/imageclock/app.js
+++ b/apps/imageclock/app.js
@@ -408,19 +408,16 @@ function drawPoly(graphics, resources, element){
 
     endPerfLog("drawPoly_transform");
 
-    if (element.ForegroundColor) graphics.setColor(element.ForegroundColor);
-
     if (element.Filled){
       startPerfLog("drawPoly_g.fillPoly");
       graphics.fillPoly(vertices,true);
       endPerfLog("drawPoly_g.fillPoly");
+    } else {
+      startPerfLog("drawPoly_g.drawPoly");
+      graphics.drawPoly(vertices,true);
+      endPerfLog("drawPoly_g.drawPoly");
     }
 
-    if (element.BackgroundColor) graphics.setColor(element.BackgroundColor);
-    startPerfLog("drawPoly_g.drawPoly");
-    graphics.drawPoly(vertices,true);
-    endPerfLog("drawPoly_g.drawPoly");
-
     endPerfLog("drawPoly");
 }
 
@@ -428,8 +425,6 @@ function drawRect(graphics, resources, element){
     startPerfLog("drawRect");
     var vertices = [];
 
-    if (element.ForegroundColor) graphics.setColor(element.ForegroundColor);
-
     if (element.Filled){
       startPerfLog("drawRect_g.fillRect");
       graphics.fillRect(element.X, element.Y, element.X + element.Width, element.Y + element.Height);
@@ -442,6 +437,21 @@ function drawRect(graphics, resources, element){
     endPerfLog("drawRect");
 }
 
+function drawCircle(graphics, resources, element){
+    startPerfLog("drawCircle");
+
+    if (element.Filled){
+      startPerfLog("drawCircle_g.fillCircle");
+      graphics.fillCircle(element.X, element.Y, element.Radius);
+      endPerfLog("drawCircle_g.fillCircle");
+    } else {
+      startPerfLog("drawCircle_g.drawCircle");
+      graphics.drawCircle(element.X, element.Y, element.Radius);
+      endPerfLog("drawCircle_g.drawCircle");
+    }
+    endPerfLog("drawCircle");
+}
+
 var numbers = {};
 numbers.Hour = () => { return new Date().getHours(); };
 numbers.HourTens = () => { return Math.floor(new Date().getHours()/10); };
diff --git a/apps/imageclock/custom.html b/apps/imageclock/custom.html
index 0fdbe14fd..7872a0b1d 100644
--- a/apps/imageclock/custom.html
+++ b/apps/imageclock/custom.html
@@ -570,7 +570,7 @@
           if (typeof element.Plane == "number") next.Plane = element.Plane;
           next.Layer = element.Layer ? (element.Layer) : "" + c;
           
-          if (["MultiState","Image","CodedImage","Number","Poly","Rect","Scale"].includes(c)){
+          if (["MultiState","Image","CodedImage","Number","Circle","Poly","Rect","Scale"].includes(c)){
             result.push({type:c, value: next});
           } else {
             result = result.concat(collapseTree(next));