diff --git a/CandlePanel.js b/CandlePanel.js
index 6c013cebd..c4c8ce19c 100644
--- a/CandlePanel.js
+++ b/CandlePanel.js
@@ -271,10 +271,12 @@ function newAAMastersPlottersCandlesVolumesCandlesCandlePanel() {
             let labelPoint;
             let fontSize = 10;
 
-            browserCanvasContext.font = fontSize + 'px Courier New';
+            browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY;
 
             let label = '' + labelToPrint;
-
+            if (isNaN(label) === false) {
+                label = Number(label).toLocaleString();
+            }
             let xOffset = label.length / 2 * fontSize * FONT_ASPECT_RATIO;
 
             labelPoint = {
diff --git a/VolumePanel.js b/VolumePanel.js
index 0f92c7205..aae9ecb46 100644
--- a/VolumePanel.js
+++ b/VolumePanel.js
@@ -192,9 +192,12 @@ function newAAMastersPlottersCandlesVolumesVolumesVolumePanel() {
             let labelPoint;
             let fontSize = 10;
 
-            browserCanvasContext.font = fontSize + 'px Courier New';
+            browserCanvasContext.font = fontSize + 'px ' + UI_FONT.SECONDARY;
 
             let label = '' + labelToPrint;
+            if (isNaN(label) === false) {
+                label = Number(label).toLocaleString();
+            }
 
             let xOffset = label.length / 2 * fontSize * FONT_ASPECT_RATIO;