diff --git a/package.json b/package.json
index f246bed9d4..6c82c7bba1 100644
--- a/package.json
+++ b/package.json
@@ -156,7 +156,7 @@
     "@babel/preset-typescript": "7.21.5",
     "@koa/cors": "4.0.0",
     "@octokit/auth-oauth-device": "4.0.4",
-    "@octokit/plugin-retry": "4.1.5",
+    "@octokit/plugin-retry": "4.1.6",
     "@octokit/rest": "19.0.11",
     "@open-wc/dev-server-hmr": "0.1.4",
     "@rollup/plugin-babel": "6.0.3",
diff --git a/pyproject.toml b/pyproject.toml
index bfaaa029d6..2e85624f1a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name         = "home-assistant-frontend"
-version      = "20230605.0"
+version      = "20230606.0"
 license      = {text = "Apache-2.0"}
 description  = "The Home Assistant frontend"
 readme       = "README.md"
diff --git a/src/components/entity/state-badge.ts b/src/components/entity/state-badge.ts
index e855bfdd57..4fbfcaf853 100644
--- a/src/components/entity/state-badge.ts
+++ b/src/components/entity/state-badge.ts
@@ -38,6 +38,31 @@ export class StateBadge extends LitElement {
 
   @state() private _iconStyle: { [name: string]: string | undefined } = {};
 
+  connectedCallback(): void {
+    super.connectedCallback();
+    if (
+      this.hasUpdated &&
+      this.overrideImage === undefined &&
+      (this.stateObj?.attributes.entity_picture ||
+        this.stateObj?.attributes.entity_picture_local)
+    ) {
+      // Update image on connect, so we get new auth token
+      this.requestUpdate("stateObj");
+    }
+  }
+
+  disconnectedCallback() {
+    super.disconnectedCallback();
+    if (
+      this.overrideImage === undefined &&
+      (this.stateObj?.attributes.entity_picture ||
+        this.stateObj?.attributes.entity_picture_local)
+    ) {
+      // Clear image on disconnect so we don't fetch with old auth when we reconnect
+      this.style.backgroundImage = "";
+    }
+  }
+
   private get _stateColor() {
     const domain = this.stateObj
       ? computeStateDomain(this.stateObj)
diff --git a/src/dialogs/more-info/controls/more-info-cover.ts b/src/dialogs/more-info/controls/more-info-cover.ts
index ef9b0f069d..b4fe8114ba 100644
--- a/src/dialogs/more-info/controls/more-info-cover.ts
+++ b/src/dialogs/more-info/controls/more-info-cover.ts
@@ -195,7 +195,7 @@ class MoreInfoCover extends LitElement {
                     <ha-icon-button
                       .label=${this.hass.localize(
                         `ui.dialogs.more_info_control.cover.switch_mode.${
-                          this._mode || "position"
+                          this._mode === "position" ? "button" : "position"
                         }`
                       )}
                       .path=${this._mode === "position"
diff --git a/src/dialogs/more-info/ha-more-info-history.ts b/src/dialogs/more-info/ha-more-info-history.ts
index f9e14f6338..8bf93c3997 100644
--- a/src/dialogs/more-info/ha-more-info-history.ts
+++ b/src/dialogs/more-info/ha-more-info-history.ts
@@ -192,7 +192,8 @@ export class MoreInfoHistory extends LitElement {
         }
       }
     }
-    if (!isComponentLoaded(this.hass, "history") || this._subscribed) {
+
+    if (!isComponentLoaded(this.hass, "history")) {
       return;
     }
     if (this._subscribed) {
diff --git a/src/panels/config/devices/ha-config-devices-dashboard.ts b/src/panels/config/devices/ha-config-devices-dashboard.ts
index 0a2a027e30..f6f88f3246 100644
--- a/src/panels/config/devices/ha-config-devices-dashboard.ts
+++ b/src/panels/config/devices/ha-config-devices-dashboard.ts
@@ -224,8 +224,12 @@ export class HaConfigDeviceDashboard extends LitElement {
           this.hass,
           deviceEntityLookup[device.id]
         ),
-        model: device.model || "<unknown>",
-        manufacturer: device.manufacturer || "<unknown>",
+        model:
+          device.model ||
+          `<${localize("ui.panel.config.devices.data_table.unknown")}>`,
+        manufacturer:
+          device.manufacturer ||
+          `<${localize("ui.panel.config.devices.data_table.unknown")}>`,
         area:
           device.area_id && areaLookup[device.area_id]
             ? areaLookup[device.area_id].name
diff --git a/src/panels/developer-tools/statistics/developer-tools-statistics.ts b/src/panels/developer-tools/statistics/developer-tools-statistics.ts
index 6f0d7510f7..6fb023fbb6 100644
--- a/src/panels/developer-tools/statistics/developer-tools-statistics.ts
+++ b/src/panels/developer-tools/statistics/developer-tools-statistics.ts
@@ -71,33 +71,43 @@ class HaPanelDevStatistics extends SubscribeMixin(LitElement) {
   private _columns = memoizeOne(
     (localize): DataTableColumnContainer => ({
       displayName: {
-        title: "Name",
+        title: localize(
+          "ui.panel.developer-tools.tabs.statistics.data_table.name"
+        ),
         sortable: true,
         filterable: true,
         grows: true,
       },
       statistic_id: {
-        title: "Statistic id",
+        title: localize(
+          "ui.panel.developer-tools.tabs.statistics.data_table.statistic_id"
+        ),
         sortable: true,
         filterable: true,
         hidden: this.narrow,
         width: "20%",
       },
       statistics_unit_of_measurement: {
-        title: "Statistics unit",
+        title: localize(
+          "ui.panel.developer-tools.tabs.statistics.data_table.statistics_unit"
+        ),
         sortable: true,
         filterable: true,
         width: "10%",
         forceLTR: true,
       },
       source: {
-        title: "Source",
+        title: localize(
+          "ui.panel.developer-tools.tabs.statistics.data_table.source"
+        ),
         sortable: true,
         filterable: true,
         width: "10%",
       },
       issues: {
-        title: "Issue",
+        title: localize(
+          "ui.panel.developer-tools.tabs.statistics.data_table.issue"
+        ),
         sortable: true,
         filterable: true,
         direction: "asc",
diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts
index 3017c1ad3d..0447b6f646 100644
--- a/src/panels/lovelace/hui-root.ts
+++ b/src/panels/lovelace/hui-root.ts
@@ -802,7 +802,7 @@ class HUIRoot extends LitElement {
     }
     if (this._yamlMode) {
       showAlertDialog(this, {
-        text: "The edit UI is not available when in YAML mode.",
+        text: this.hass!.localize("ui.panel.lovelace.editor.yaml_unsupported"),
       });
       return;
     }
diff --git a/src/translations/en.json b/src/translations/en.json
index 2f11673fe8..f275796d06 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -3062,7 +3062,8 @@
             "battery": "Battery",
             "disabled_by": "Disabled",
             "no_devices": "No devices",
-            "no_integration": "No integration"
+            "no_integration": "No integration",
+            "unknown": "unknown"
           },
           "delete": "Delete",
           "confirm_delete": "Are you sure you want to delete this device?",
@@ -4284,6 +4285,7 @@
         },
         "editor": {
           "header": "Edit UI",
+          "yaml_unsupported": "The edit UI is not available when in YAML mode.",
           "menu": {
             "open": "Open dashboard menu",
             "raw_editor": "Raw configuration editor",
@@ -5269,7 +5271,14 @@
                 "clear": "Delete all old statistic data for this entity"
               }
             },
-            "adjust_sum": "Adjust sum"
+            "adjust_sum": "Adjust sum",
+            "data_table": {
+              "name": "Name",
+              "statistic_id": "Statistic id",
+              "statistics_unit": "Statistics unit",
+              "source": "Source",
+              "issue": "Issue"
+            }
           },
           "yaml": {
             "title": "YAML",
diff --git a/yarn.lock b/yarn.lock
index 31b67fa444..68a607c80b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3349,15 +3349,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/plugin-retry@npm:4.1.5":
-  version: 4.1.5
-  resolution: "@octokit/plugin-retry@npm:4.1.5"
+"@octokit/plugin-retry@npm:4.1.6":
+  version: 4.1.6
+  resolution: "@octokit/plugin-retry@npm:4.1.6"
   dependencies:
     "@octokit/types": ^9.0.0
     bottleneck: ^2.15.3
   peerDependencies:
     "@octokit/core": ">=3"
-  checksum: 37272a0dd2fea5025797bb0f6812899c048468b3ef35c0413154230ef0d5c3e323a76bb9eb971ea5ba498f68407711507336852783443397a185a9a75b28b06c
+  checksum: 9bebaf7fc9c34683d7e97c0398ab9f5a164ce8770e92e8b8a65ed8e85ee3b0fddc5c72dfb18da112e2f643434d217ec7092f57496808c4ae6c2a824f42ae1ccf
   languageName: node
   linkType: hard
 
@@ -9669,7 +9669,7 @@ __metadata:
     "@mdi/js": 7.2.96
     "@mdi/svg": 7.2.96
     "@octokit/auth-oauth-device": 4.0.4
-    "@octokit/plugin-retry": 4.1.5
+    "@octokit/plugin-retry": 4.1.6
     "@octokit/rest": 19.0.11
     "@open-wc/dev-server-hmr": 0.1.4
     "@polymer/app-layout": 3.1.0