From 709b0f7ff639d0346ada6a823db0beb4be1b6501 Mon Sep 17 00:00:00 2001
From: Paul Marbach <paul.marbach@grafana.com>
Date: Wed, 3 Dec 2025 08:26:48 -0500
Subject: [PATCH 1/2] use correct icons for expressions

---
 .../panel-edit/PanelDataPane/AddDataItemMenu.tsx         | 3 ++-
 .../expressions/components/ExpressionTypeDropdown.tsx    | 9 +--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/AddDataItemMenu.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/AddDataItemMenu.tsx
index cac0d965f57..b0d0d29e046 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/AddDataItemMenu.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/AddDataItemMenu.tsx
@@ -3,6 +3,7 @@ import { memo } from 'react';
 import { t } from '@grafana/i18n';
 import { config } from '@grafana/runtime';
 import { Dropdown, IconButton, Menu, Stack } from '@grafana/ui';
+import { EXPRESSION_ICON_MAP } from 'app/features/expressions/consts';
 import { ExpressionQueryType } from 'app/features/expressions/types';
 
 interface AddDataItemMenuProps {
@@ -38,7 +39,7 @@ export const AddDataItemMenu = memo(({ onAddQuery, onAddTransform, onAddExpressi
   }
 
   const expressionSubItems = expressionTypes.map(({ type, label }) => (
-    <Menu.Item key={type} label={label} icon="calculator-alt" onClick={() => onAddExpression(type)} />
+    <Menu.Item key={type} label={label} icon={EXPRESSION_ICON_MAP[type]} onClick={() => onAddExpression(type)} />
   ));
 
   const menu = (
diff --git a/public/app/features/expressions/components/ExpressionTypeDropdown.tsx b/public/app/features/expressions/components/ExpressionTypeDropdown.tsx
index bb84dcd076c..20bb7f0fb4d 100644
--- a/public/app/features/expressions/components/ExpressionTypeDropdown.tsx
+++ b/public/app/features/expressions/components/ExpressionTypeDropdown.tsx
@@ -5,14 +5,7 @@ import { FeatureState, GrafanaTheme2, SelectableValue } from '@grafana/data';
 import { Dropdown, FeatureBadge, Icon, Menu, Tooltip, useStyles2 } from '@grafana/ui';
 import { ExpressionQueryType, expressionTypes } from 'app/features/expressions/types';
 
-const EXPRESSION_ICON_MAP = {
-  [ExpressionQueryType.math]: 'calculator-alt',
-  [ExpressionQueryType.reduce]: 'compress-arrows',
-  [ExpressionQueryType.resample]: 'sync',
-  [ExpressionQueryType.classic]: 'cog',
-  [ExpressionQueryType.threshold]: 'sliders-v-alt',
-  [ExpressionQueryType.sql]: 'database',
-} as const satisfies Record<ExpressionQueryType, string>;
+import { EXPRESSION_ICON_MAP } from '../consts';
 
 interface ExpressionTypeDropdownProps {
   children: ReactElement;

From b6cd25350069bd1e27083a404397761368e5c9b1 Mon Sep 17 00:00:00 2001
From: Paul Marbach <paul.marbach@grafana.com>
Date: Wed, 3 Dec 2025 08:31:39 -0500
Subject: [PATCH 2/2] expressions icon const

---
 public/app/features/expressions/consts.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 public/app/features/expressions/consts.ts

diff --git a/public/app/features/expressions/consts.ts b/public/app/features/expressions/consts.ts
new file mode 100644
index 00000000000..8bf422f8a9f
--- /dev/null
+++ b/public/app/features/expressions/consts.ts
@@ -0,0 +1,10 @@
+import { ExpressionQueryType } from './types';
+
+export const EXPRESSION_ICON_MAP = {
+  [ExpressionQueryType.math]: 'calculator-alt',
+  [ExpressionQueryType.reduce]: 'compress-arrows',
+  [ExpressionQueryType.resample]: 'sync',
+  [ExpressionQueryType.classic]: 'cog',
+  [ExpressionQueryType.threshold]: 'sliders-v-alt',
+  [ExpressionQueryType.sql]: 'database',
+} as const satisfies Record<ExpressionQueryType, string>;