diff --git a/src/octoprint/static/js/app/viewmodels/files.js b/src/octoprint/static/js/app/viewmodels/files.js
index 829a4fd1..2d5f6b7c 100644
--- a/src/octoprint/static/js/app/viewmodels/files.js
+++ b/src/octoprint/static/js/app/viewmodels/files.js
@@ -349,12 +349,12 @@ $(function() {
                         }
                     }
                 }
-                output += gettext("Estimated Print Time") + ": " + formatFuzzyPrintTime(data["gcodeAnalysis"]["estimatedPrintTime"]) + "<br>";
+                output += gettext("Estimated print time") + ": " + formatFuzzyPrintTime(data["gcodeAnalysis"]["estimatedPrintTime"]) + "<br>";
             }
             if (data["prints"] && data["prints"]["last"]) {
-                output += gettext("Last Printed") + ": " + formatTimeAgo(data["prints"]["last"]["date"]) + "<br>";
+                output += gettext("Last printed") + ": " + formatTimeAgo(data["prints"]["last"]["date"]) + "<br>";
                 if (data["prints"]["last"]["lastPrintTime"]) {
-                    output += gettext("Last Print Time") + ": " + formatDuration(data["prints"]["last"]["lastPrintTime"]);
+                    output += gettext("Last print time") + ": " + formatDuration(data["prints"]["last"]["lastPrintTime"]);
                 }
             }
             return output;
diff --git a/src/octoprint/static/js/app/viewmodels/gcode.js b/src/octoprint/static/js/app/viewmodels/gcode.js
index f1aac086..98b6e838 100644
--- a/src/octoprint/static/js/app/viewmodels/gcode.js
+++ b/src/octoprint/static/js/app/viewmodels/gcode.js
@@ -462,17 +462,17 @@ $(function() {
                 var output = [];
                 output.push(gettext("Layer number") + ": " + (layer.number + 1));
                 output.push(gettext("Layer height") + " (mm): " + layer.height);
-                output.push(gettext("GCODE commands in layer") + ": " + layer.commands);
+                output.push(gettext("GCODE commands") + ": " + layer.commands);
                 if (layer.filament != undefined) {
                     if (layer.filament.length == 1) {
-                        output.push(gettext("Filament used by layer") + ": " + layer.filament[0].toFixed(2) + "mm");
+                        output.push(gettext("Filament") + ": " + layer.filament[0].toFixed(2) + "mm");
                     } else {
                         for (var i = 0; i < layer.filament.length; i++) {
-                            output.push(gettext("Filament used by layer") + " (" + gettext("Tool") + " " + i + "): " + layer.filament[i].toFixed(2) + "mm");
+                            output.push(gettext("Filament") + " (" + gettext("Tool") + " " + i + "): " + layer.filament[i].toFixed(2) + "mm");
                         }
                     }
                 }
-                output.push(gettext("Print time for layer") + ": " + formatFuzzyPrintTime(layer.printTime));
+                output.push(gettext("Estimated print time") + ": " + formatDuration(layer.printTime));
 
                 self.ui_layerInfo(output.join("<br>"));
 
diff --git a/src/octoprint/templates/tabs/gcodeviewer.jinja2 b/src/octoprint/templates/tabs/gcodeviewer.jinja2
index dc5bbde4..e13defbd 100644
--- a/src/octoprint/templates/tabs/gcodeviewer.jinja2
+++ b/src/octoprint/templates/tabs/gcodeviewer.jinja2
@@ -62,7 +62,13 @@
     </div>
 
     <div class="muted">
-        <small>{{ _('Note that the time estimates in this tab are calculated by the GCODE viewer in your browser and might differ from the values calculated by the server that are displayed in the "State" and "Files" panels in the sidebar due to slightly different implementations.') }}</small>
+        <small>{% trans %}
+            Note that the time and usage values in this tab are <strong>estimated</strong> by the GCODE viewer in your
+            browser and might differ from the values <strong>estimated</strong> by the server that are displayed in the
+            "State" and "Files" panels in the sidebar due to slightly different implementations. Also note that these
+            <strong>estimated</strong> values may be inaccurate since they can also take information present in the
+            GCODE file into account.
+        {% endtrans %}</small>
     </div>
 </div>
 <div data-bind="visible: waitForApproval">