diff --git a/src/panels/config/backup/components/config/ha-backup-config-agents.ts b/src/panels/config/backup/components/config/ha-backup-config-agents.ts
index e9895fc505a5..7d6200bd5857 100644
--- a/src/panels/config/backup/components/config/ha-backup-config-agents.ts
+++ b/src/panels/config/backup/components/config/ha-backup-config-agents.ts
@@ -1,4 +1,4 @@
-import { mdiDatabase } from "@mdi/js";
+import { mdiHarddisk } from "@mdi/js";
 import type { PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
@@ -64,7 +64,7 @@ class HaBackupConfigAgents extends LitElement {
                   <ha-md-list-item>
                     ${isLocalAgent(agentId)
                       ? html`
-                          <ha-svg-icon .path=${mdiDatabase} slot="start">
+                          <ha-svg-icon .path=${mdiHarddisk} slot="start">
                           </ha-svg-icon>
                         `
                       : html`
diff --git a/src/panels/config/backup/components/ha-backup-agents-picker.ts b/src/panels/config/backup/components/ha-backup-agents-picker.ts
index a586eec3f75a..6a5fb7ca63f4 100644
--- a/src/panels/config/backup/components/ha-backup-agents-picker.ts
+++ b/src/panels/config/backup/components/ha-backup-agents-picker.ts
@@ -1,4 +1,4 @@
-import { mdiDatabase } from "@mdi/js";
+import { mdiHarddisk } from "@mdi/js";
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -61,7 +61,7 @@ class HaBackupAgentsPicker extends LitElement {
         <span class="label" slot="label">
           ${isLocalAgent(agentId)
             ? html`
-                <ha-svg-icon .path=${mdiDatabase} slot="start"> </ha-svg-icon>
+                <ha-svg-icon .path=${mdiHarddisk} slot="start"> </ha-svg-icon>
               `
             : html`
                 <img
diff --git a/src/panels/config/backup/components/overview/ha-backup-overview-settings.ts b/src/panels/config/backup/components/overview/ha-backup-overview-settings.ts
index 2d7b0589c09a..794e88198204 100644
--- a/src/panels/config/backup/components/overview/ha-backup-overview-settings.ts
+++ b/src/panels/config/backup/components/overview/ha-backup-overview-settings.ts
@@ -1,4 +1,4 @@
-import { mdiCalendar, mdiCog, mdiPuzzle, mdiUpload } from "@mdi/js";
+import { mdiCalendar, mdiDatabase, mdiPuzzle, mdiUpload } from "@mdi/js";
 import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
@@ -113,7 +113,7 @@ class HaBackupBackupsSummary extends LitElement {
               </div>
             </ha-md-list-item>
             <ha-md-list-item>
-              <ha-svg-icon slot="start" .path=${mdiCog}></ha-svg-icon>
+              <ha-svg-icon slot="start" .path=${mdiDatabase}></ha-svg-icon>
               <div slot="headline">
                 ${this.config.create_backup.include_database
                   ? "Settings and history"
diff --git a/src/panels/config/backup/ha-config-backup-backups.ts b/src/panels/config/backup/ha-config-backup-backups.ts
index c89d39f46a35..1c7cdefcce7b 100644
--- a/src/panels/config/backup/ha-config-backup-backups.ts
+++ b/src/panels/config/backup/ha-config-backup-backups.ts
@@ -1,8 +1,8 @@
 import {
-  mdiDatabase,
   mdiDelete,
   mdiDotsVertical,
   mdiDownload,
+  mdiHarddisk,
   mdiPlus,
   mdiUpload,
 } from "@mdi/js";
@@ -147,7 +147,7 @@ class HaConfigBackupBackups extends SubscribeMixin(LitElement) {
               if (isLocalAgent(agentId)) {
                 return html`
                   <ha-svg-icon
-                    .path=${mdiDatabase}
+                    .path=${mdiHarddisk}
                     title=${name}
                     slot="graphic"
                   ></ha-svg-icon>
diff --git a/src/panels/config/backup/ha-config-backup-details.ts b/src/panels/config/backup/ha-config-backup-details.ts
index 0f37a3bd59f3..86df796b3650 100644
--- a/src/panels/config/backup/ha-config-backup-details.ts
+++ b/src/panels/config/backup/ha-config-backup-details.ts
@@ -1,5 +1,5 @@
 import type { ActionDetail } from "@material/mwc-list";
-import { mdiDatabase, mdiDelete, mdiDotsVertical, mdiDownload } from "@mdi/js";
+import { mdiDelete, mdiDotsVertical, mdiDownload, mdiHarddisk } from "@mdi/js";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { formatDateTime } from "../../../common/datetime/format_date_time";
@@ -177,7 +177,7 @@ class HaConfigBackupDetails extends LitElement {
                               ${isLocalAgent(agentId)
                                 ? html`
                                     <ha-svg-icon
-                                      .path=${mdiDatabase}
+                                      .path=${mdiHarddisk}
                                       slot="start"
                                     >
                                     </ha-svg-icon>
diff --git a/src/state/connection-mixin.ts b/src/state/connection-mixin.ts
index 2a219abccb36..6afb6d277d7f 100644
--- a/src/state/connection-mixin.ts
+++ b/src/state/connection-mixin.ts
@@ -89,7 +89,7 @@ export const connectionMixin = <T extends Constructor<HassBaseEl>>(
           notifyOnError = true,
           returnResponse = false
         ) => {
-          if (__DEV__ || this.hass?.debugConnection) {
+          if (this.hass?.debugConnection) {
             // eslint-disable-next-line no-console
             console.log(
               "Calling service",
@@ -115,7 +115,7 @@ export const connectionMixin = <T extends Constructor<HassBaseEl>>(
             ) {
               return { context: { id: "" } };
             }
-            if (__DEV__ || this.hass?.debugConnection) {
+            if (this.hass?.debugConnection) {
               // eslint-disable-next-line no-console
               console.error(
                 "Error calling service",
@@ -167,7 +167,7 @@ export const connectionMixin = <T extends Constructor<HassBaseEl>>(
         ) => fetchWithAuth(auth, `${auth.data.hassUrl}${path}`, init),
         // For messages that do not get a response
         sendWS: (msg) => {
-          if (__DEV__ || this.hass?.debugConnection) {
+          if (this.hass?.debugConnection) {
             // eslint-disable-next-line no-console
             console.log("Sending", msg);
           }
@@ -175,14 +175,14 @@ export const connectionMixin = <T extends Constructor<HassBaseEl>>(
         },
         // For messages that expect a response
         callWS: <R>(msg) => {
-          if (__DEV__ || this.hass?.debugConnection) {
+          if (this.hass?.debugConnection) {
             // eslint-disable-next-line no-console
             console.log("Sending", msg);
           }
 
           const resp = conn.sendMessagePromise<R>(msg);
 
-          if (__DEV__ || this.hass?.debugConnection) {
+          if (this.hass?.debugConnection) {
             resp.then(
               // eslint-disable-next-line no-console
               (result) => console.log("Received", result),