diff --git a/site/src/modules/dashboard/Navbar/NavbarView.stories.tsx b/site/src/modules/dashboard/Navbar/NavbarView.stories.tsx
index fac1f344ce0c4..cf5522c56203a 100644
--- a/site/src/modules/dashboard/Navbar/NavbarView.stories.tsx
+++ b/site/src/modules/dashboard/Navbar/NavbarView.stories.tsx
@@ -25,3 +25,9 @@ export const ForMember: Story = {
     canViewAllUsers: false,
   },
 };
+
+export const CustomLogo: Story = {
+  args: {
+    logo_url: "/icon/github.svg",
+  },
+};
diff --git a/site/src/modules/dashboard/Navbar/NavbarView.tsx b/site/src/modules/dashboard/Navbar/NavbarView.tsx
index 2ad38dcf9fe58..558706eee614a 100644
--- a/site/src/modules/dashboard/Navbar/NavbarView.tsx
+++ b/site/src/modules/dashboard/Navbar/NavbarView.tsx
@@ -13,6 +13,7 @@ import { type FC, type ReactNode, useRef, useState } from "react";
 import { NavLink, useLocation, useNavigate } from "react-router-dom";
 import type * as TypesGen from "api/typesGenerated";
 import { Abbr } from "components/Abbr/Abbr";
+import { ExternalImage } from "components/ExternalImage/ExternalImage";
 import { displayError } from "components/GlobalSnackbar/utils";
 import { CoderIcon } from "components/Icons/CoderIcon";
 import { Latency } from "components/Latency/Latency";
@@ -150,7 +151,7 @@ export const NavbarView: FC<NavbarViewProps> = ({
             <div css={styles.drawerHeader}>
               <div css={[styles.logo, styles.drawerLogo]}>
                 {logo_url ? (
-                  <img src={logo_url} alt="Custom Logo" />
+                  <ExternalImage src={logo_url} alt="Custom Logo" />
                 ) : (
                   <CoderIcon />
                 )}
@@ -167,7 +168,7 @@ export const NavbarView: FC<NavbarViewProps> = ({
 
         <NavLink css={styles.logo} to="/workspaces">
           {logo_url ? (
-            <img src={logo_url} alt="Custom Logo" />
+            <ExternalImage src={logo_url} alt="Custom Logo" />
           ) : (
             <CoderIcon fill="white" opacity={1} width={125} />
           )}
diff --git a/site/src/pages/UserSettingsPage/AppearancePage/AppearanceForm.tsx b/site/src/pages/UserSettingsPage/AppearancePage/AppearanceForm.tsx
index ae0d15358e0f6..6b34ba19b93f2 100644
--- a/site/src/pages/UserSettingsPage/AppearancePage/AppearanceForm.tsx
+++ b/site/src/pages/UserSettingsPage/AppearancePage/AppearanceForm.tsx
@@ -57,7 +57,6 @@ export const AppearanceForm: FC<AppearanceFormProps> = ({
         />
         <ThemePreviewButton
           displayName="Light"
-          preview
           active={currentTheme === "light"}
           theme={themes.light}
           onSelect={() => onChangeTheme("light")}