diff --git a/public/static/images/voice-assistant/area.gif b/public/static/images/voice-assistant/area.gif
deleted file mode 100644
index e56aebd62d..0000000000
Binary files a/public/static/images/voice-assistant/area.gif and /dev/null differ
diff --git a/public/static/images/voice-assistant/area.png b/public/static/images/voice-assistant/area.png
new file mode 100644
index 0000000000..d325705c0e
Binary files /dev/null and b/public/static/images/voice-assistant/area.png differ
diff --git a/public/static/images/voice-assistant/change-wake-word.gif b/public/static/images/voice-assistant/change-wake-word.gif
deleted file mode 100644
index d8fec78be5..0000000000
Binary files a/public/static/images/voice-assistant/change-wake-word.gif and /dev/null differ
diff --git a/public/static/images/voice-assistant/change-wake-word.png b/public/static/images/voice-assistant/change-wake-word.png
new file mode 100644
index 0000000000..7be0377c0d
Binary files /dev/null and b/public/static/images/voice-assistant/change-wake-word.png differ
diff --git a/public/static/images/voice-assistant/error.gif b/public/static/images/voice-assistant/error.gif
deleted file mode 100644
index 0e19c5a20d..0000000000
Binary files a/public/static/images/voice-assistant/error.gif and /dev/null differ
diff --git a/public/static/images/voice-assistant/error.png b/public/static/images/voice-assistant/error.png
new file mode 100644
index 0000000000..84008f9da9
Binary files /dev/null and b/public/static/images/voice-assistant/error.png differ
diff --git a/public/static/images/voice-assistant/great-job.png b/public/static/images/voice-assistant/great-job.png
new file mode 100644
index 0000000000..5e2fa242ac
Binary files /dev/null and b/public/static/images/voice-assistant/great-job.png differ
diff --git a/public/static/images/voice-assistant/heart.gif b/public/static/images/voice-assistant/heart.gif
deleted file mode 100644
index 8a7c956829..0000000000
Binary files a/public/static/images/voice-assistant/heart.gif and /dev/null differ
diff --git a/public/static/images/voice-assistant/heart.png b/public/static/images/voice-assistant/heart.png
new file mode 100644
index 0000000000..3eac74cfb7
Binary files /dev/null and b/public/static/images/voice-assistant/heart.png differ
diff --git a/public/static/images/voice-assistant/hi.gif b/public/static/images/voice-assistant/hi.gif
deleted file mode 100644
index 9769ad0d29..0000000000
Binary files a/public/static/images/voice-assistant/hi.gif and /dev/null differ
diff --git a/public/static/images/voice-assistant/hi.png b/public/static/images/voice-assistant/hi.png
new file mode 100644
index 0000000000..9c37a9a2fd
Binary files /dev/null and b/public/static/images/voice-assistant/hi.png differ
diff --git a/public/static/images/voice-assistant/ok-nabu.gif b/public/static/images/voice-assistant/ok-nabu.gif
deleted file mode 100644
index 866269f23a..0000000000
Binary files a/public/static/images/voice-assistant/ok-nabu.gif and /dev/null differ
diff --git a/public/static/images/voice-assistant/ok-nabu.png b/public/static/images/voice-assistant/ok-nabu.png
new file mode 100644
index 0000000000..f909705537
Binary files /dev/null and b/public/static/images/voice-assistant/ok-nabu.png differ
diff --git a/public/static/images/voice-assistant/sleep.gif b/public/static/images/voice-assistant/sleep.gif
deleted file mode 100644
index 23ddb402b6..0000000000
Binary files a/public/static/images/voice-assistant/sleep.gif and /dev/null differ
diff --git a/public/static/images/voice-assistant/sleep.png b/public/static/images/voice-assistant/sleep.png
new file mode 100644
index 0000000000..1639006a34
Binary files /dev/null and b/public/static/images/voice-assistant/sleep.png differ
diff --git a/public/static/images/voice-assistant/update.gif b/public/static/images/voice-assistant/update.gif
deleted file mode 100644
index a8b569ef99..0000000000
Binary files a/public/static/images/voice-assistant/update.gif and /dev/null differ
diff --git a/public/static/images/voice-assistant/update.png b/public/static/images/voice-assistant/update.png
new file mode 100644
index 0000000000..685b63e3f8
Binary files /dev/null and b/public/static/images/voice-assistant/update.png differ
diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts
index 2fabe74db1..4d7a5d8535 100644
--- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts
+++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-dialog.ts
@@ -66,6 +66,8 @@ export class HaVoiceAssistantSetupDialog extends LitElement {
   private _dialogClosed() {
     this._params = undefined;
     this._assistConfiguration = undefined;
+    this._previousSteps = [];
+    this._nextStep = undefined;
     this._step = STEP.INIT;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-area.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-area.ts
index 31c25e178c..d6c918c957 100644
--- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-area.ts
+++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-area.ts
@@ -17,7 +17,7 @@ export class HaVoiceAssistantSetupStepArea extends LitElement {
     const device = this.hass.devices[this.deviceId];
 
     return html`<div class="content">
-        <img src="/static/images/voice-assistant/area.gif" />
+        <img src="/static/images/voice-assistant/area.png" />
         <h1>Select area</h1>
         <p class="secondary">
           When you voice assistant knows where it is, it can better control the
diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-change-wake-word.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-change-wake-word.ts
index 1ea24948f1..8f51521c9b 100644
--- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-change-wake-word.ts
+++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-change-wake-word.ts
@@ -21,7 +21,7 @@ export class HaVoiceAssistantSetupStepChangeWakeWord extends LitElement {
 
   protected override render() {
     return html`<div class="padding content">
-        <img src="/static/images/voice-assistant/change-wake-word.gif" />
+        <img src="/static/images/voice-assistant/change-wake-word.png" />
         <h1>Change wake word</h1>
         <p class="secondary">
           Some wake words are better for
diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-check.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-check.ts
index a12a243c2e..415d6e4d13 100644
--- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-check.ts
+++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-check.ts
@@ -6,6 +6,7 @@ import "../../components/ha-circular-progress";
 import { testAssistSatelliteConnection } from "../../data/assist_satellite";
 import type { HomeAssistant } from "../../types";
 import { AssistantSetupStyles } from "./styles";
+import { documentationUrl } from "../../util/documentation-url";
 
 @customElement("ha-voice-assistant-setup-step-check")
 export class HaVoiceAssistantSetupStepCheck extends LitElement {
@@ -35,7 +36,7 @@ export class HaVoiceAssistantSetupStepCheck extends LitElement {
   protected override render() {
     return html`<div class="content">
       ${this._status === "timeout"
-        ? html`<img src="/static/images/voice-assistant/error.gif" />
+        ? html`<img src="/static/images/voice-assistant/error.png" />
             <h1>The voice assistant is unable to connect to Home Assistant</h1>
             <p class="secondary">
               To play audio, the voice assistant device has to connect to Home
@@ -44,12 +45,15 @@ export class HaVoiceAssistantSetupStepCheck extends LitElement {
             </p>
             <div class="footer">
               <a
-                href="https://www.home-assistant.io/docs/configuration/remote/#adding-a-remote-url-to-home-assistant"
+                href=${documentationUrl(
+                  this.hass,
+                  "/voice_control/troubleshooting/#i-dont-get-a-voice-response"
+                )}
                 ><ha-button>Help me</ha-button></a
               >
               <ha-button @click=${this._testConnection}>Retry</ha-button>
             </div>`
-        : html`<img src="/static/images/voice-assistant/hi.gif" />
+        : html`<img src="/static/images/voice-assistant/hi.png" />
             <h1>Hi</h1>
             <p class="secondary">
               Over the next couple steps we're going to personalize your voice
diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-success.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-success.ts
index f4b171bda7..939d76be5e 100644
--- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-success.ts
+++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-success.ts
@@ -67,7 +67,7 @@ export class HaVoiceAssistantSetupStepSuccess extends LitElement {
       : undefined;
 
     return html`<div class="content">
-        <img src="/static/images/voice-assistant/heart.gif" />
+        <img src="/static/images/voice-assistant/heart.png" />
         <h1>Ready to Assist!</h1>
         <p class="secondary">
           Make any final customizations here. You can always change these in the
diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-update.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-update.ts
index 9171ff15f0..e81afa480b 100644
--- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-update.ts
+++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-update.ts
@@ -65,7 +65,7 @@ export class HaVoiceAssistantSetupStepUpdate extends LitElement {
     const progressIsNumeric = stateObj && updateUsesProgress(stateObj);
 
     return html`<div class="content">
-      <img src="/static/images/voice-assistant/update.gif" />
+      <img src="/static/images/voice-assistant/update.png" />
       <h1>
         ${stateObj &&
         (stateObj.state === "unavailable" || updateIsInstalling(stateObj))
diff --git a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-wake-word.ts b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-wake-word.ts
index 2515f7ba9c..442ca54192 100644
--- a/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-wake-word.ts
+++ b/src/dialogs/voice-assistant-setup/voice-assistant-setup-step-wake-word.ts
@@ -64,14 +64,14 @@ export class HaVoiceAssistantSetupStepWakeWord extends LitElement {
     return html`<div class="content">
         ${!this._detected
           ? html`
-          <img src="/static/images/voice-assistant/sleep.gif" />
+          <img src="/static/images/voice-assistant/sleep.png" />
           <h1>
             Say “${this._activeWakeWord(this.assistConfiguration)}” to wake the
             device up
           </h1>
           <p class="secondary">Setup will continue once the device is awake.</p>
         </div>`
-          : html`<img src="/static/images/voice-assistant/ok-nabu.gif" />
+          : html`<img src="/static/images/voice-assistant/ok-nabu.png" />
               <h1>
                 Say “${this._activeWakeWord(this.assistConfiguration)}” again
               </h1>