diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet
index 573fb2e1b..c3b32f254 160000
--- a/extensions-builtin/sd-webui-controlnet
+++ b/extensions-builtin/sd-webui-controlnet
@@ -1 +1 @@
-Subproject commit 573fb2e1b2360d366a73cf264e383c8334577d5c
+Subproject commit c3b32f254368ffc96b6aae9eab0a8fe7450a359f
diff --git a/javascript/style.css b/javascript/style.css
index 1fd04582a..491d21d7e 100644
--- a/javascript/style.css
+++ b/javascript/style.css
@@ -120,12 +120,12 @@ div#extras_scale_to_tab div.form{ flex-direction: row; }
 #quicksettings > button { margin-left: -0.5em; }
 
 #settings { display: flex; gap: var(--layout-gap); }
-#settings div { border: none; display: inline-flex; justify-content: normal; }
+#settings div { border: none; display: inline-flex; justify-content: normal; gap: 0.5em; }
 #settings > div.tab-content { flex: 10 0 75%; display: grid; }
 
 #settings > div.tab-content > div { border: none; padding: 0; }
 #settings > div.tab-content > div > div > div > div > div { flex-direction: unset; }
-#settings > div.tab-nav { display: grid; grid-template-columns: repeat(auto-fill, .3em minmax(10em, 1fr)); flex: 1 0 auto; width: 12em; align-self: flex-start; gap: var(--spacing-md); }
+#settings > div.tab-nav { display: grid; grid-template-columns: repeat(auto-fill, .5em minmax(10em, 1fr)); flex: 1 0 auto; width: 12em; align-self: flex-start; gap: var(--spacing-lg); }
 #settings > div.tab-nav button { display: block; border: none; text-align: left; white-space: initial; padding: 0; }
 #settings > div.tab-nav > #settings_show_all_pages { padding: var(--size-2) var(--size-4); }
 #settings .block.gradio-checkbox { margin: 0; width: auto; }
diff --git a/modules/images.py b/modules/images.py
index 335c55a12..f283e959a 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -551,7 +551,7 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='jpg', i
             file_decoration = shared.opts.samples_filename_pattern
         else:
             file_decoration = "[seq]-[prompt_words]"
-        file_decoration = namegen.apply(file_decoration) + suffix
+        file_decoration = namegen.apply(file_decoration).strip(' ').strip('-') + suffix
         if shared.opts.save_images_add_number:
             if '[seq]' not in file_decoration:
                 file_decoration = f"[seq]-{file_decoration}"
diff --git a/modules/processing.py b/modules/processing.py
index 87b09aa11..acfad51a4 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -931,6 +931,7 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
             self.extra_generation_params["Hires steps"] = self.hr_second_pass_steps
         if self.hr_upscaler is not None:
             self.extra_generation_params["Hires upscaler"] = self.hr_upscaler
+        self.extra_generation_params["Secondary sampler"] = self.latent_sampler
 
     def sample(self, conditioning, unconditional_conditioning, seeds, subseeds, subseed_strength, prompts):
 
diff --git a/modules/processing_diffusers.py b/modules/processing_diffusers.py
index 8347f3c30..d021dfff1 100644
--- a/modules/processing_diffusers.py
+++ b/modules/processing_diffusers.py
@@ -366,6 +366,7 @@ def process_diffusers(p: StableDiffusionProcessing, seeds, prompts, negative_pro
             p.extra_generation_params['Refiner steps'] = p.refiner_steps
             p.extra_generation_params['Refiner start'] = p.refiner_start
             p.extra_generation_params["Hires steps"] = p.hr_second_pass_steps
+            p.extra_generation_params["Secondary sampler"] = p.latent_sampler
 
             if not shared.state.interrupted and not shared.state.skipped:
                 refiner_images = vae_decode(latents=refiner_output.images, model=shared.sd_refiner, full_quality=True)
diff --git a/modules/ui.py b/modules/ui.py
index eda645a22..612cc406e 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -495,6 +495,7 @@ def create_ui(startup_timer = None):
                 (subseed_strength, "Variation strength"),
                 (clip_skip, "Clip skip"),
                 (latent_index, "Latent sampler"),
+                (latent_index, "Secondary sampler"),
                 (denoising_strength, "Denoising strength"),
                 (refiner_steps, "Refiner steps"),
                 (refiner_start, "Refiner start"),
@@ -854,6 +855,7 @@ def create_ui(startup_timer = None):
                 (subseed_strength, "Variation strength"),
                 (clip_skip, "Clip skip"),
                 (latent_index, "Latent sampler"),
+                (latent_index, "Secondary sampler"),
                 (denoising_strength, "Denoising strength"),
                 (refiner_steps, "Refiner steps"),
                 (refiner_start, "Refiner start"),