diff --git a/apps/web/src/components/BranchToolbar.tsx b/apps/web/src/components/BranchToolbar.tsx
index d59cd1aa44997..6f87daabd2719 100644
--- a/apps/web/src/components/BranchToolbar.tsx
+++ b/apps/web/src/components/BranchToolbar.tsx
@@ -258,17 +258,7 @@ const RunContextSelector = memo(function RunContextSelector({
       <TooltipPopup>{autoEnvironmentLabel ?? activeEnvironment?.label ?? "Run on"}</TooltipPopup>
     </Tooltip>
   );
-  const icon = !showEnvironmentIndicator ? (
-    workspaceIcon
-  ) : isPanel ? (
-    environmentIcon
-  ) : (
-    // Button's SVG margins consume 4px of the gap; mx-0! restores the intended 2px.
-    <span className="inline-flex shrink-0 items-center gap-0.5">
-      {environmentIcon}
-      {workspaceIcon}
-    </span>
-  );
+  const icon = showEnvironmentIndicator ? environmentIcon : workspaceIcon;
   const triggerContent = (
     <>
       {icon}