diff --git a/octoprint_CalibrationTools/templates/macros.jinja2 b/octoprint_CalibrationTools/templates/macros.jinja2
index 6df0570..b3c601e 100644
--- a/octoprint_CalibrationTools/templates/macros.jinja2
+++ b/octoprint_CalibrationTools/templates/macros.jinja2
@@ -69,4 +69,16 @@
 <span class="add-on" title="{{ title }}">
     <a target="_blank" href="https://marlinfw.org/docs/gcode/{{command}}.html"><i class="fas fa-info-circle"></i></a>
 </span>
+{% endmacro %}
+
+
+{% macro m500Icon(title='Save settings in EEPROM', before=true ) %}
+{% set title = title|trim %}
+{% if before %}
+{{ linkToMarlin("M500", "Marlin website") }}
+{% endif %}
+<span class="add-on" title="{{ title }}">M500</span>
+{% if not before %}
+{{ linkToMarlin("M500", "Marlin website") }}
+{% endif %}
 {% endmacro %}
\ No newline at end of file
diff --git a/octoprint_CalibrationTools/templates/tabs/tab-esteps.jinja2 b/octoprint_CalibrationTools/templates/tabs/tab-esteps.jinja2
index 094e893..1fa6ed5 100644
--- a/octoprint_CalibrationTools/templates/tabs/tab-esteps.jinja2
+++ b/octoprint_CalibrationTools/templates/tabs/tab-esteps.jinja2
@@ -84,8 +84,7 @@
         <div class="input-prepend input-append">
             {{ snipped.linkToMarlin("M92", "Marlin website") }}
             <span class="add-on" title="Command to change number of steps/mm for E axe" data-bind="text: $root.results.newStepsDisplay"></span>
-            {{ snipped.linkToMarlin("M500", "Marlin website") }}
-            <span class="add-on" title="Command for saving steps in EEPROM">M500</span>
+            {{ snipped.m500Icon() }}
         </div>
     </div>
 </div>
diff --git a/octoprint_CalibrationTools/templates/tabs/tab-pid.jinja2 b/octoprint_CalibrationTools/templates/tabs/tab-pid.jinja2
index 93c00b2..9317aca 100644
--- a/octoprint_CalibrationTools/templates/tabs/tab-pid.jinja2
+++ b/octoprint_CalibrationTools/templates/tabs/tab-pid.jinja2
@@ -34,6 +34,7 @@ Current bed temperature: <span data-bind="text: bedCurrentTemp"></span>&#176; Be
             <span class="add-on" title="">&nbsp;&nbsp;&nbsp;S</span>
             <input type="number" id="tunningPIDToolTemp" class="input-mini" step="1" min="100" max="280" title="Target temperature" data-bind="value: $root.pid.targetTemp">
             <span class="add-on" title="">&nbsp;&nbsp;&nbsp;U1</span>
+            {{ snipped.m500Icon() }}
         </div>
     </div>
 </div>
@@ -42,7 +43,7 @@ Current bed temperature: <span data-bind="text: bedCurrentTemp"></span>&#176; Be
     <div class="span5"></div>
     <div class="span7">
         <button class="btn btn-success" data-bind="click: $root.pidHotEndTune, enable: $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
-            title="This will trigger PID auto tuning (M106 Sx; M303 Ex Sx U1; M501)">
+            title="This will trigger PID auto tuning (M106 Sx; M303 Ex Sx U1; M500)">
             <i class="fas fa-play" style="color:false" data-color="false"></i>&nbsp&nbsp
             Start PID tunning
         </button>