diff --git a/site/src/modules/resources/AppLink/BaseIcon.tsx b/site/src/modules/resources/AppLink/BaseIcon.tsx
index 1f2885a49a02f..b768facbdd482 100644
--- a/site/src/modules/resources/AppLink/BaseIcon.tsx
+++ b/site/src/modules/resources/AppLink/BaseIcon.tsx
@@ -1,5 +1,6 @@
 import ComputerIcon from "@mui/icons-material/Computer";
 import type { WorkspaceApp } from "api/typesGenerated";
+import { ExternalImage } from "components/ExternalImage/ExternalImage";
 import type { FC } from "react";
 
 interface BaseIconProps {
@@ -9,7 +10,7 @@ interface BaseIconProps {
 
 export const BaseIcon: FC<BaseIconProps> = ({ app, onIconPathError }) => {
 	return app.icon ? (
-		<img
+		<ExternalImage
 			alt={`${app.display_name} Icon`}
 			src={app.icon}
 			style={{ pointerEvents: "none" }}
diff --git a/site/src/theme/externalImages.ts b/site/src/theme/externalImages.ts
index 612d7ab2c75d4..c15c16f43672a 100644
--- a/site/src/theme/externalImages.ts
+++ b/site/src/theme/externalImages.ts
@@ -160,4 +160,5 @@ export const defaultParametersForBuiltinIcons = new Map<string, string>([
 	["/icon/rust.svg", "monochrome"],
 	["/icon/terminal.svg", "monochrome"],
 	["/icon/widgets.svg", "monochrome"],
+	["/icon/windsurf.svg", "monochrome"],
 ]);