diff --git a/picamera_coverage.zip b/picamera_coverage.zip
index 95750fa8..d1d27c2d 100644
Binary files a/picamera_coverage.zip and b/picamera_coverage.zip differ
diff --git a/src/openflexure_microscope_server/things/camera/picamera.py b/src/openflexure_microscope_server/things/camera/picamera.py
index 0158c56e..40f28f8b 100644
--- a/src/openflexure_microscope_server/things/camera/picamera.py
+++ b/src/openflexure_microscope_server/things/camera/picamera.py
@@ -881,42 +881,47 @@ class StreamingPiCamera2(BaseCamera):
                 notify_on_success=True,
                 success_message="Finished recalibration.",
             ),
-            action_button_for(
-                self.auto_expose_from_minimum,
-                submit_label="Auto Gain & Shutter Speed",
-                can_terminate=False,
-            ),
-            action_button_for(
-                self.calibrate_white_balance,
-                submit_label="Auto White Balance",
-                can_terminate=False,
-            ),
-            action_button_for(
-                self.calibrate_lens_shading,
-                submit_label="Auto Flat Field Correction",
-                can_terminate=False,
-                requires_confirmation=True,
-                confirmation_message=(
-                    "Is the microscope looking at an evenly illuminated, empty field "
-                    "of view? If not, the current image will show through in any "
-                    "images captured afterwards."
-                ),
-            ),
         ]
 
     @lt.thing_property
     def secondary_calibration_actions(self) -> list[ActionButton]:
         """The calibration actions that appear only in settings panel."""
         return [
+            action_button_for(
+                self.auto_expose_from_minimum,
+                submit_label="Auto Gain & Shutter Speed",
+                can_terminate=False,
+                button_primary=False,
+            ),
+            action_button_for(
+                self.calibrate_white_balance,
+                submit_label="Auto White Balance",
+                can_terminate=False,
+                button_primary=False,
+            ),
+            action_button_for(
+                self.calibrate_lens_shading,
+                submit_label="Auto Flat Field Correction",
+                can_terminate=False,
+                button_primary=False,
+                requires_confirmation=True,
+                confirmation_message=(
+                    "Is the microscope looking at an evenly illuminated, empty field "
+                    "of view? If not, the current image will show through in any "
+                    "images captured afterwards."
+                ),
+            ),
             action_button_for(
                 self.flat_lens_shading,
                 submit_label="Disable Flat Field Correction",
                 can_terminate=False,
+                button_primary=False,
             ),
             action_button_for(
                 self.reset_lens_shading,
                 submit_label="Reset Flat Field Correction",
                 can_terminate=False,
+                button_primary=False,
             ),
         ]
 
diff --git a/webapp/src/components/tabContentComponents/controlComponents/paneControl.vue b/webapp/src/components/tabContentComponents/controlComponents/paneControl.vue
index b4e57b2b..82ae71e8 100644
--- a/webapp/src/components/tabContentComponents/controlComponents/paneControl.vue
+++ b/webapp/src/components/tabContentComponents/controlComponents/paneControl.vue
@@ -119,7 +119,7 @@
                   action="fast_autofocus"
                   :submit-data="{ dz: 2000 }"
                   :submit-label="'Autofocus'"
-                  :button-primary="false"
+                  :button-primary="true"
                   :submit-on-event="'globalFastAutofocusEvent'"
                   @taskStarted="isAutofocusing = 1"
                   @finished="