diff --git a/src/components/widgets/toolhead/ToolChangeCommands.vue b/src/components/widgets/toolhead/ToolChangeCommands.vue
new file mode 100644
index 0000000000..0ea7aebf3f
--- /dev/null
+++ b/src/components/widgets/toolhead/ToolChangeCommands.vue
@@ -0,0 +1,70 @@
+<template>
+  <v-row v-if="toolChangeCommands.length > 0">
+    <v-col>
+      <app-btn-group>
+        <v-tooltip
+          v-for="(macro, index) of toolChangeCommands"
+          :key="index"
+          top
+        >
+          <template #activator="{ on, attrs }">
+            <app-btn
+              v-bind="attrs"
+              min-width="10"
+              :color="macro.color"
+              :disabled="!klippyReady || printerPrinting"
+              class="px-0 flex-grow-1"
+              v-on="on"
+              @click="sendGcode(macro.name)"
+            >
+              {{ macro.name }}
+            </app-btn>
+          </template>
+          {{ macro.description }}
+        </v-tooltip>
+      </app-btn-group>
+    </v-col>
+  </v-row>
+</template>
+
+<script lang="ts">
+import { Component, Mixins } from 'vue-property-decorator'
+import StateMixin from '@/mixins/state'
+
+type ToolChangeCommand = {
+  name: string,
+  description: string,
+  color?: string,
+  active?: boolean
+}
+
+@Component({})
+export default class ToolChangeCommands extends Mixins(StateMixin) {
+  get toolChangeCommands (): ToolChangeCommand[] {
+    const availableCommands = this.$store.state.console.availableCommands
+
+    return Object.keys(availableCommands)
+      .filter(command => /^t\d+$/i.test(command))
+      .map(command => {
+        const description = availableCommands[command] !== 'G-Code macro'
+          ? availableCommands[command]
+          : this.$t('app.tool.tooltip.select_tool', { tool: command.substring(1) })
+
+        const macro = this.$store.getters['macros/getMacroByName'](command.toLowerCase())
+
+        return {
+          name: command,
+          description,
+          color: macro?.variables?.color ? `#${macro.variables.color}` : undefined,
+          active: macro?.variables?.active ?? false
+        } satisfies ToolChangeCommand
+      })
+      .sort((a, b) => {
+        const numberA = parseInt(a.name.substring(1))
+        const numberB = parseInt(b.name.substring(1))
+
+        return numberA - numberB
+      })
+  }
+}
+</script>
diff --git a/src/components/widgets/toolhead/ToolChangeMacros.vue b/src/components/widgets/toolhead/ToolChangeMacros.vue
deleted file mode 100644
index 5d6c5b4f3b..0000000000
--- a/src/components/widgets/toolhead/ToolChangeMacros.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<template>
-  <v-row v-if="toolChangeMacros.length > 0">
-    <v-col>
-      <app-btn-group>
-        <app-btn
-          v-for="(macro, index) of toolChangeMacros"
-          :key="index"
-          min-width="10"
-          :color="macro.color"
-          :disabled="!klippyReady || printerPrinting"
-          class="px-0 flex-grow-1"
-          @click="sendGcode(macro.name)"
-        >
-          {{ macro.name }}
-        </app-btn>
-      </app-btn-group>
-    </v-col>
-  </v-row>
-</template>
-
-<script lang="ts">
-import { Component, Mixins } from 'vue-property-decorator'
-import StateMixin from '@/mixins/state'
-import { Macro } from '@/store/macros/types'
-
-const toolChangeMacroRegExp = /^t\d+$/i
-
-type ToolChangeMacro = {
-  name: string,
-  color?: string,
-  active?: boolean
-}
-
-@Component({})
-export default class ToolChangeMacros extends Mixins(StateMixin) {
-  get macros (): Macro[] {
-    return this.$store.getters['macros/getMacros'] as Macro[]
-  }
-
-  get toolChangeMacros (): ToolChangeMacro[] {
-    return this.macros
-      .filter(macro => toolChangeMacroRegExp.test(macro.name))
-      .map(macro => ({
-        name: macro.name.toUpperCase(),
-        color: macro.variables?.color ? `#${macro.variables.color}` : undefined,
-        active: macro.variables?.active ?? false
-      } as ToolChangeMacro))
-      .sort((a, b) => {
-        const numberA = parseInt(a.name.substring(1))
-        const numberB = parseInt(b.name.substring(1))
-
-        return numberA - numberB
-      })
-  }
-}
-</script>
diff --git a/src/components/widgets/toolhead/Toolhead.vue b/src/components/widgets/toolhead/Toolhead.vue
index 6425e325e0..2076387ff5 100644
--- a/src/components/widgets/toolhead/Toolhead.vue
+++ b/src/components/widgets/toolhead/Toolhead.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <v-card-text>
-      <tool-change-macros />
+      <tool-change-commands />
 
       <v-row
         justify="space-between"
@@ -52,7 +52,7 @@ import SpeedAndFlowAdjust from './SpeedAndFlowAdjust.vue'
 import PressureAdvanceAdjust from './PressureAdvanceAdjust.vue'
 import ExtruderStats from './ExtruderStats.vue'
 import ExtruderSteppers from './ExtruderSteppers.vue'
-import ToolChangeMacros from './ToolChangeMacros.vue'
+import ToolChangeCommands from './ToolChangeCommands.vue'
 import { Extruder } from '@/store/printer/types'
 import { ToolheadControlStyle } from '@/store/config/types'
 
@@ -68,7 +68,7 @@ import { ToolheadControlStyle } from '@/store/config/types'
     PressureAdvanceAdjust,
     ExtruderStats,
     ExtruderSteppers,
-    ToolChangeMacros
+    ToolChangeCommands
   }
 })
 export default class Toolhead extends Mixins(StateMixin) {
diff --git a/src/locales/en.yaml b/src/locales/en.yaml
index 1f42ab3d89..df35042fbe 100644
--- a/src/locales/en.yaml
+++ b/src/locales/en.yaml
@@ -662,6 +662,7 @@ app:
       manual_probe: Manual Probe
       motors_off: Motors Off
       relative_positioning: Relative Positioning
+      select_tool: Select tool %{tool}
       tools: Tools
     label:
       stats_active_extruder: >-
diff --git a/src/store/macros/getters.ts b/src/store/macros/getters.ts
index 6cf299b7a0..c4362076a6 100644
--- a/src/store/macros/getters.ts
+++ b/src/store/macros/getters.ts
@@ -47,6 +47,12 @@ export const getters: GetterTree<MacrosState, RootState> = {
     return macros
   },
 
+  getMacroByName: (state, getters) => (name: string) => {
+    const macros = getters.getMacros as Macro[]
+
+    return macros.find(macro => macro.name === name)
+  },
+
   // Gets visible macros, transformed. Should include the macro's config.
   // Is only used on the dashboard. Grouped by category.
   getVisibleMacros: (state, getters) => {