diff --git a/cast/public/sw-legacy.js b/cast/public/sw-legacy.js
new file mode 100644
index 0000000000..acf83b949a
--- /dev/null
+++ b/cast/public/sw-legacy.js
@@ -0,0 +1,5 @@
+"use strict";
+
+self.addEventListener("fetch", (event) => {
+  event.respondWith(fetch(event.request));
+});
diff --git a/cast/public/service_worker.js b/cast/public/sw-modern.js
similarity index 100%
rename from cast/public/service_worker.js
rename to cast/public/sw-modern.js
diff --git a/demo/public/sw-legacy.js b/demo/public/sw-legacy.js
new file mode 100644
index 0000000000..acf83b949a
--- /dev/null
+++ b/demo/public/sw-legacy.js
@@ -0,0 +1,5 @@
+"use strict";
+
+self.addEventListener("fetch", (event) => {
+  event.respondWith(fetch(event.request));
+});
diff --git a/demo/public/service_worker.js b/demo/public/sw-modern.js
similarity index 100%
rename from demo/public/service_worker.js
rename to demo/public/sw-modern.js
diff --git a/package.json b/package.json
index 905bac737b..79dbc826b5 100644
--- a/package.json
+++ b/package.json
@@ -118,7 +118,7 @@
     "leaflet-draw": "1.0.4",
     "lit": "2.8.0",
     "luxon": "3.4.4",
-    "marked": "13.0.2",
+    "marked": "13.0.3",
     "memoize-one": "6.0.0",
     "node-vibrant": "3.2.1-alpha.1",
     "proxy-polyfill": "0.3.2",
diff --git a/src/components/ha-selector/ha-selector-image.ts b/src/components/ha-selector/ha-selector-image.ts
index cde24f883c..ff337e8810 100644
--- a/src/components/ha-selector/ha-selector-image.ts
+++ b/src/components/ha-selector/ha-selector-image.ts
@@ -45,7 +45,14 @@ export class HaImageSelector extends LitElement {
     return html`
       <div>
         <label>
-          ${this.hass.localize("ui.components.selectors.image.select_image")}
+          ${this.hass.localize(
+            "ui.components.selectors.image.select_image_with_label",
+            {
+              label:
+                this.label ||
+                this.hass.localize("ui.components.selectors.image.image"),
+            }
+          )}
           <ha-formfield
             .label=${this.hass.localize("ui.components.selectors.image.upload")}
           >
diff --git a/src/fake_data/provide_hass.ts b/src/fake_data/provide_hass.ts
index 692d975cd3..4baa8db899 100644
--- a/src/fake_data/provide_hass.ts
+++ b/src/fake_data/provide_hass.ts
@@ -226,6 +226,7 @@ export const provideHass = (
       },
       suspendReconnectUntil: noop,
       suspend: noop,
+      ping: noop,
       socket: {
         readyState: WebSocket.OPEN,
       },
diff --git a/src/layouts/home-assistant.ts b/src/layouts/home-assistant.ts
index e9cbe62888..b7841fada3 100644
--- a/src/layouts/home-assistant.ts
+++ b/src/layouts/home-assistant.ts
@@ -200,6 +200,11 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {
   }
 
   protected async checkDataBaseMigration() {
+    if (__DEMO__) {
+      this._databaseMigration = false;
+      return;
+    }
+
     let recorderInfoProm: Promise<RecorderInfo> | undefined;
     const preloadWindow = window as WindowWithPreloads;
     // On first load, we speed up loading page by having recorderInfoProm ready
diff --git a/src/panels/lovelace/editor/config-elements/elements/hui-image-element-editor.ts b/src/panels/lovelace/editor/config-elements/elements/hui-image-element-editor.ts
index 06c9ee68d6..24e761be8a 100644
--- a/src/panels/lovelace/editor/config-elements/elements/hui-image-element-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/elements/hui-image-element-editor.ts
@@ -41,7 +41,7 @@ const SCHEMA = [
       ui_action: {},
     },
   },
-  { name: "image", selector: { text: {} } },
+  { name: "image", selector: { image: {} } },
   { name: "camera_image", selector: { entity: { domain: "camera" } } },
   {
     name: "camera_view",
diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-elements-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-elements-card-editor.ts
index 329a19ab8e..a2d16716ff 100644
--- a/src/panels/lovelace/editor/config-elements/hui-picture-elements-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-picture-elements-card-editor.ts
@@ -74,8 +74,8 @@ export class HuiPictureElementsCardEditor
           ),
           schema: [
             { name: "title", selector: { text: {} } },
-            { name: "image", selector: { text: {} } },
-            { name: "dark_mode_image", selector: { text: {} } },
+            { name: "image", selector: { image: {} } },
+            { name: "dark_mode_image", selector: { image: {} } },
             {
               name: "camera_image",
               selector: { entity: { domain: "camera" } },
diff --git a/src/translations/en.json b/src/translations/en.json
index 8510a8045f..135f06cfea 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -379,7 +379,8 @@
           "unknown_file": "Unknown file"
         },
         "image": {
-          "select_image": "Select image",
+          "image": "image",
+          "select_image_with_label": "Select {label}",
           "upload": "Upload picture",
           "url": "Local path or web URL"
         },
diff --git a/yarn.lock b/yarn.lock
index b49be286f7..0181c0d22c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9142,7 +9142,7 @@ __metadata:
     luxon: "npm:3.4.4"
     magic-string: "npm:0.30.10"
     map-stream: "npm:0.0.7"
-    marked: "npm:13.0.2"
+    marked: "npm:13.0.3"
     memoize-one: "npm:6.0.0"
     mocha: "npm:10.5.0"
     node-vibrant: "npm:3.2.1-alpha.1"
@@ -10929,12 +10929,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"marked@npm:13.0.2":
-  version: 13.0.2
-  resolution: "marked@npm:13.0.2"
+"marked@npm:13.0.3":
+  version: 13.0.3
+  resolution: "marked@npm:13.0.3"
   bin:
     marked: bin/marked.js
-  checksum: 10/73696e2d9d77995011f7a75acaa82a8d3b68cbe7072ad06cfdaddef9cb716022f07c3e51f91710db25338dda7736815d0aa9673950bf27c0ed325e6e3549db38
+  checksum: 10/95daf69e316879a3be112793f203093b2646aeeaa1b7eedc6ea7902bff6af44da045cd35c723711645bc7d92dbe872101e5a36976b48164e1efc1356b12a4a57
   languageName: node
   linkType: hard