diff --git a/docs/changelog.md b/docs/changelog.md
index 45bb6022..fe6e4cc6 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,7 +1,10 @@
 ## Changelog
 
-### 2021 03 06
-* Added ability to include configuration files
+#### 2021 03 07
+* Move fine tuning from control menu to job_status screen for easier access.
+
+#### 2021 03 06
+* Added ability to include configuration files.
 
 #### 2021 03 05
 * Multiple printers are now available in the main branch.
diff --git a/ks_includes/KlipperScreen.conf b/ks_includes/KlipperScreen.conf
index 4ea60352..2c414a21 100644
--- a/ks_includes/KlipperScreen.conf
+++ b/ks_includes/KlipperScreen.conf
@@ -168,11 +168,6 @@ name: {{ gettext('Temperature') }}
 icon: heat-up
 panel: temperature
 
-[menu __print tuning]
-name: {{ gettext('Fine Tuning') }}
-icon: fan
-panel: fine_tune
-
 [menu __print fan]
 name: {{ gettext('Fan') }}
 icon: fan
diff --git a/panels/job_status.py b/panels/job_status.py
index 91f2e3bf..1ec9f87c 100644
--- a/panels/job_status.py
+++ b/panels/job_status.py
@@ -254,6 +254,9 @@ class JobStatusPanel(ScreenPanel):
         self.labels['cancel'].connect("clicked", self.cancel)
         self.labels['control'] = self._gtk.ButtonImage("control",_("Control"),"color3")
         self.labels['control'].connect("clicked", self._screen._go_to_submenu, "")
+        self.labels['fine_tune'] = self._gtk.ButtonImage("fine-tune",_("Fine Tuning"),"color4")
+        self.labels['fine_tune'].connect("clicked", self.menu_item_clicked, "fine_tune",{
+            "panel": "fine_tune", "name": _("Fine Tuning")})
         self.labels['menu'] = self._gtk.ButtonImage("complete",_("Main Menu"),"color4")
         self.labels['menu'].connect("clicked", self.close_panel)
         self.labels['pause'] = self._gtk.ButtonImage("pause",_("Pause"),"color1" )
@@ -486,12 +489,12 @@ class JobStatusPanel(ScreenPanel):
         if self.state == "printing":
             self.labels['button_grid'].attach(self.labels['pause'], 0, 0, 1, 1)
             self.labels['button_grid'].attach(self.labels['cancel'], 1, 0, 1, 1)
-            self.labels['button_grid'].attach(Gtk.Label(""), 2, 0, 1, 1)
+            self.labels['button_grid'].attach(self.labels['fine_tune'], 2, 0, 1, 1)
             self.labels['button_grid'].attach(self.labels['control'], 3, 0, 1, 1)
         elif self.state == "paused":
             self.labels['button_grid'].attach(self.labels['resume'], 0, 0, 1, 1)
             self.labels['button_grid'].attach(self.labels['cancel'], 1, 0, 1, 1)
-            self.labels['button_grid'].attach(Gtk.Label(""), 2, 0, 1, 1)
+            self.labels['button_grid'].attach(self.labels['fine_tune'], 2, 0, 1, 1)
             self.labels['button_grid'].attach(self.labels['control'], 3, 0, 1, 1)
         elif self.state == "error" or self.state == "complete" or self.state == "cancelled":
             self.labels['button_grid'].attach(Gtk.Label(""), 0, 0, 1, 1)
diff --git a/styles/z-bolt/images/fine-tune.svg b/styles/z-bolt/images/fine-tune.svg
new file mode 100644
index 00000000..5b19244b
--- /dev/null
+++ b/styles/z-bolt/images/fine-tune.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="black" width="18px" height="18px">
+    <path d="M0 0h24v24H0z" fill="none"/>
+    <path style="fill: #fff;" d="M3 17v2h6v-2H3zM3 5v2h10V5H3zm10 16v-2h8v-2h-8v-2h-2v6h2zM7 9v2H3v2h4v2h2V9H7zm14 4v-2H11v2h10zm-6-4h2V7h4V5h-4V3h-2v6z"/>
+</svg>