diff --git a/pyproject.toml b/pyproject.toml
index 1f2a5dc343..325102ba12 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name         = "home-assistant-frontend"
-version      = "20230503.0"
+version      = "20230503.1"
 license      = {text = "Apache-2.0"}
 description  = "The Home Assistant frontend"
 readme       = "README.md"
diff --git a/src/data/google_assistant.ts b/src/data/google_assistant.ts
index 1381e697ed..03c79e1c14 100644
--- a/src/data/google_assistant.ts
+++ b/src/data/google_assistant.ts
@@ -4,6 +4,7 @@ export interface GoogleEntity {
   entity_id: string;
   traits: string[];
   might_2fa: boolean;
+  disable_2fa?: boolean;
 }
 
 export const fetchCloudGoogleEntities = (hass: HomeAssistant) =>
diff --git a/src/panels/config/voice-assistants/assist-pref.ts b/src/panels/config/voice-assistants/assist-pref.ts
index 47149da4dd..65665b9ce7 100644
--- a/src/panels/config/voice-assistants/assist-pref.ts
+++ b/src/panels/config/voice-assistants/assist-pref.ts
@@ -207,9 +207,14 @@ export class AssistPref extends LitElement {
         display: flex;
         flex-direction: row;
       }
+      :host([dir="rtl"]) .header-actions {
+        right: auto;
+        left: 0;
+      }
       .header-actions .icon-link {
         margin-top: -16px;
         margin-inline-end: 8px;
+        margin-inline-start: 8px;
         margin-right: 8px;
         direction: var(--direction);
         color: var(--secondary-text-color);
@@ -239,6 +244,8 @@ export class AssistPref extends LitElement {
       img {
         height: 28px;
         margin-right: 16px;
+        margin-inline-end: 16px;
+        margin-inline-start: initial;
       }
     `;
   }
diff --git a/src/panels/config/voice-assistants/cloud-alexa-pref.ts b/src/panels/config/voice-assistants/cloud-alexa-pref.ts
index 4f4eeef1cf..2e3f507a64 100644
--- a/src/panels/config/voice-assistants/cloud-alexa-pref.ts
+++ b/src/panels/config/voice-assistants/cloud-alexa-pref.ts
@@ -284,6 +284,8 @@ export class CloudAlexaPref extends LitElement {
       img {
         height: 28px;
         margin-right: 16px;
+        margin-inline-end: 16px;
+        margin-inline-start: initial;
       }
     `;
   }
diff --git a/src/panels/config/voice-assistants/cloud-discover.ts b/src/panels/config/voice-assistants/cloud-discover.ts
index f762251d78..581ee0041e 100644
--- a/src/panels/config/voice-assistants/cloud-discover.ts
+++ b/src/panels/config/voice-assistants/cloud-discover.ts
@@ -18,10 +18,33 @@ export class CloudDiscover extends LitElement {
         <div class="card-content">
           <h1 class="header">
             ${this.hass.localize(
-              "ui.panel.config.voice_assistants.assistants.cloud.header"
+              "ui.panel.config.voice_assistants.assistants.cloud.title",
+              {
+                home_assistant_cloud: html`
+                  <span class="no-wrap">Home Assistant Cloud</span>
+                `,
+              }
             )}
           </h1>
           <div class="features">
+            <div class="feature">
+              <div class="logos">
+                <div class="round-icon">
+                  <ha-svg-icon .path=${mdiMicrophoneMessage}></ha-svg-icon>
+                </div>
+              </div>
+              <h2>
+                ${this.hass.localize(
+                  "ui.panel.config.voice_assistants.assistants.cloud.features.speech.title"
+                )}
+                <span class="no-wrap"></span>
+              </h2>
+              <p>
+                ${this.hass.localize(
+                  "ui.panel.config.voice_assistants.assistants.cloud.features.speech.text"
+                )}
+              </p>
+            </div>
             <div class="feature">
               <div class="logos">
                 <img
@@ -54,23 +77,6 @@ export class CloudDiscover extends LitElement {
                 )}
               </p>
             </div>
-            <div class="feature">
-              <div class="logos">
-                <div class="round-icon">
-                  <ha-svg-icon .path=${mdiMicrophoneMessage}></ha-svg-icon>
-                </div>
-              </div>
-              <h2>
-                ${this.hass.localize(
-                  "ui.panel.config.voice_assistants.assistants.cloud.features.speech.title"
-                )}
-              </h2>
-              <p>
-                ${this.hass.localize(
-                  "ui.panel.config.voice_assistants.assistants.cloud.features.speech.text"
-                )}
-              </p>
-            </div>
           </div>
           <div class="more">
             <a href="https://www.nabucasa.com" target="_blank" rel="noreferrer">
@@ -195,6 +201,9 @@ export class CloudDiscover extends LitElement {
       .more a ha-svg-icon {
         --mdc-icon-size: 16px;
       }
+      .no-wrap {
+        white-space: nowrap;
+      }
     `;
   }
 }
diff --git a/src/panels/config/voice-assistants/cloud-google-pref.ts b/src/panels/config/voice-assistants/cloud-google-pref.ts
index ebdcdef163..dfe3b263de 100644
--- a/src/panels/config/voice-assistants/cloud-google-pref.ts
+++ b/src/panels/config/voice-assistants/cloud-google-pref.ts
@@ -364,6 +364,8 @@ export class CloudGooglePref extends LitElement {
       img {
         height: 28px;
         margin-right: 16px;
+        margin-inline-end: 16px;
+        margin-inline-start: initial;
       }
     `;
   }
diff --git a/src/panels/config/voice-assistants/entity-voice-settings.ts b/src/panels/config/voice-assistants/entity-voice-settings.ts
index 9c92bfebd0..95d129c4a7 100644
--- a/src/panels/config/voice-assistants/entity-voice-settings.ts
+++ b/src/panels/config/voice-assistants/entity-voice-settings.ts
@@ -211,7 +211,6 @@ export class EntityVoiceSettings extends SubscribeMixin(LitElement) {
               (googleManual && key === "cloud.google_assistant");
 
             const support2fa =
-              this.entry &&
               key === "cloud.google_assistant" &&
               !googleManual &&
               supported &&
@@ -256,7 +255,7 @@ export class EntityVoiceSettings extends SubscribeMixin(LitElement) {
                         )}
                       >
                         <ha-checkbox
-                          .checked=${!this.entry!.options?.[key]?.disable_2fa}
+                          .checked=${!this._googleEntity!.disable_2fa}
                           @change=${this._2faChanged}
                         ></ha-checkbox>
                       </ha-formfield>
diff --git a/src/panels/config/voice-assistants/ha-config-voice-assistants-assistants.ts b/src/panels/config/voice-assistants/ha-config-voice-assistants-assistants.ts
index f1cfc8b24e..e88e0d9128 100644
--- a/src/panels/config/voice-assistants/ha-config-voice-assistants-assistants.ts
+++ b/src/panels/config/voice-assistants/ha-config-voice-assistants-assistants.ts
@@ -50,6 +50,7 @@ export class HaConfigVoiceAssistantsAssistants extends LitElement {
           ${isComponentLoaded(this.hass, "assist_pipeline")
             ? html`
                 <assist-pref
+                  .dir=${computeRTLDirection(this.hass)}
                   .hass=${this.hass}
                   .cloudStatus=${this.cloudStatus}
                   .exposedEntities=${this.exposedEntities}
@@ -62,13 +63,13 @@ export class HaConfigVoiceAssistantsAssistants extends LitElement {
                   .hass=${this.hass}
                   .exposedEntities=${this.exposedEntities}
                   .cloudStatus=${this.cloudStatus}
-                  dir=${computeRTLDirection(this.hass)}
+                  .dir=${computeRTLDirection(this.hass)}
                 ></cloud-alexa-pref>
                 <cloud-google-pref
                   .hass=${this.hass}
                   .exposedEntities=${this.exposedEntities}
                   .cloudStatus=${this.cloudStatus}
-                  dir=${computeRTLDirection(this.hass)}
+                  .dir=${computeRTLDirection(this.hass)}
                 ></cloud-google-pref>
               `
             : html`<cloud-discover .hass=${this.hass}></cloud-discover>`}
diff --git a/src/translations/en.json b/src/translations/en.json
index aef348483a..1b0de3e707 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -2081,14 +2081,14 @@
               }
             },
             "cloud": {
-              "header": "Get the best assistant with Home Assistant Cloud",
+              "title": "Get the best assistant with {home_assistant_cloud}",
               "features": {
                 "assistants": {
                   "title": "Google Assistant and Amazon Alexa",
                   "text": "Control all your Home Assistant devices via any Google Assistant-enabled or Alexa-enabled device."
                 },
                 "speech": {
-                  "title": "Better speech options",
+                  "title": "Amazing speech options for Assist",
                   "text": "Bring personality to your home by having it speak to you using our neural-network powered speech-to-text and text-to-speech services."
                 }
               },