diff --git a/packages/grafana-data/src/types/icon.ts b/packages/grafana-data/src/types/icon.ts
index caadf39451c..8701ac7fc7b 100644
--- a/packages/grafana-data/src/types/icon.ts
+++ b/packages/grafana-data/src/types/icon.ts
@@ -97,6 +97,7 @@ export const availableIconsIndex = {
   cube: true,
   dashboard: true,
   database: true,
+  'debug-handle': true,
   'dice-three': true,
   docker: true,
   'document-info': true,
diff --git a/public/app/core/icons/cached.json b/public/app/core/icons/cached.json
index 0bd02d1838f..163a3e7f9f9 100644
--- a/public/app/core/icons/cached.json
+++ b/public/app/core/icons/cached.json
@@ -63,6 +63,7 @@
   "unicons/cube",
   "unicons/dashboard",
   "unicons/database",
+  "unicons/debug-handle",
   "unicons/document-info",
   "unicons/download-alt",
   "unicons/draggabledots",
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/QueryTransformList.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/QueryTransformList.tsx
index 7479fc6bb93..2c7f4ed8f87 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/QueryTransformList.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/QueryTransformList.tsx
@@ -557,7 +557,7 @@ export const QueryTransformList = memo(
                                               }}
                                             >
                                               <div className={styles.debugLineHandle}>
-                                                <Icon name="draggabledots" size="sm" />
+                                                <Icon name="debug-handle" size="sm" />
                                               </div>
                                             </div>
                                           )}
@@ -713,7 +713,7 @@ export const QueryTransformList = memo(
                                               }}
                                             >
                                               <div className={styles.debugLineHandle}>
-                                                <Icon name="draggabledots" size="sm" />
+                                                <Icon name="debug-handle" size="sm" />
                                               </div>
                                             </div>
                                           )}
@@ -1042,7 +1042,8 @@ const getStyles = (theme: GrafanaTheme2, colors: ReturnType<typeof usePanelDataP
       top: '50%',
       transform: 'translate(-50%, -50%)',
       background: colors.query.accent,
-      borderRadius: theme.shape.radius.circle,
+      borderRadius: theme.shape.radius.default,
+      height: theme.spacing(2),
       padding: theme.spacing(0.5),
       display: 'flex',
       alignItems: 'center',
diff --git a/public/img/icons/unicons/debug-handle.svg b/public/img/icons/unicons/debug-handle.svg
new file mode 100644
index 00000000000..fef8197d3cc
--- /dev/null
+++ b/public/img/icons/unicons/debug-handle.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 16 5" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.8 1.66667H15.2C15.4122 1.66667 15.6157 1.57887 15.7657 1.42259C15.9157 1.26631 16 1.05435 16 0.833333C16 0.61232 15.9157 0.400358 15.7657 0.244078C15.6157 0.0877975 15.4122 0 15.2 0H0.8C0.587827 0 0.384344 0.0877975 0.234315 0.244078C0.0842854 0.400358 0 0.61232 0 0.833333C0 1.05435 0.0842854 1.26631 0.234315 1.42259C0.384344 1.57887 0.587827 1.66667 0.8 1.66667ZM15.2 3.33333H0.8C0.587827 3.33333 0.384344 3.42113 0.234315 3.57741C0.0842854 3.73369 0 3.94565 0 4.16667C0 4.38768 0.0842854 4.59964 0.234315 4.75592C0.384344 4.9122 0.587827 5 0.8 5H15.2C15.4122 5 15.6157 4.9122 15.7657 4.75592C15.9157 4.59964 16 4.38768 16 4.16667C16 3.94565 15.9157 3.73369 15.7657 3.57741C15.6157 3.42113 15.4122 3.33333 15.2 3.33333Z" fill="currentColor"/>
+</svg>