diff --git a/src/components/ui/AppMacroBtn.vue b/src/components/ui/AppMacroBtn.vue
index 517b081ea1..66e2cc6c70 100644
--- a/src/components/ui/AppMacroBtn.vue
+++ b/src/components/ui/AppMacroBtn.vue
@@ -4,6 +4,7 @@
     :disabled="(macro.disabledWhilePrinting && printerPrinting) || !klippyReady"
     :style="borderStyle"
     @click="$emit('click', macro.name)"
+    v-on="$listeners"
   >
     <slot />
   </app-btn>
@@ -15,6 +16,7 @@
       :disabled="(macro.disabledWhilePrinting && printerPrinting) || !klippyReady"
       :style="borderStyle"
       @click="$emit('click', macro.name)"
+      v-on="$listeners"
     >
       <slot />
     </app-btn>
@@ -114,8 +116,12 @@ export default class AppMacroBtn extends Mixins(StateMixin) {
   get runCommand () {
     let s = this.macro.name
     if (this.params) {
-      for (const param of Object.keys(this.params)) {
-        s += ` ${param}=${this.params[param].value}`
+      if (['m117', 'm118'].includes(this.macro.name)) {
+        s += ` ${this.params.message.value}`
+      } else {
+        for (const param of Object.keys(this.params)) {
+          s += ` ${param}=${this.params[param].value}`
+        }
       }
     }
     return s
@@ -130,7 +136,10 @@ export default class AppMacroBtn extends Mixins(StateMixin) {
 
   mounted () {
     if (!this.macro.config || !this.macro.config.gcode) return []
-    if (this.macro.config.gcode) {
+
+    if (['m117', 'm118'].includes(this.macro.name)) {
+      this.$set(this.params, 'message', { value: '', reset: '' })
+    } else {
       for (const { name, value } of gcodeMacroParams(this.macro.config.gcode)) {
         if (!this.params[name]) {
           this.$set(this.params, name, { value, reset: value })
diff --git a/src/components/widgets/macros/Macros.vue b/src/components/widgets/macros/Macros.vue
index 54fb66166e..c9ea0c1095 100644
--- a/src/components/widgets/macros/Macros.vue
+++ b/src/components/widgets/macros/Macros.vue
@@ -39,18 +39,27 @@
         </v-expansion-panel-header>
 
         <v-expansion-panel-content>
-          <app-macro-btn
+          <v-tooltip
             v-for="macro in category.macros"
             :key="`category-${macro.name}`"
-            :macro="macro"
-            :loading="hasWait(`${waits.onMacro}${macro.name}`)"
-            :elevation="2"
-            enable-params
-            class="me-2 mb-2 float-left"
-            @click="sendGcode($event, `${waits.onMacro}${macro.name}`)"
+            bottom
           >
-            {{ macro.alias || macro.name }}
-          </app-macro-btn>
+            <template #activator="{ on, attrs }">
+              <app-macro-btn
+                v-bind="attrs"
+                :macro="macro"
+                :loading="hasWait(`${waits.onMacro}${macro.name}`)"
+                :elevation="2"
+                enable-params
+                class="me-2 mb-2 float-left"
+                v-on="on"
+                @click="sendGcode($event, `${waits.onMacro}${macro.name}`)"
+              >
+                {{ macro.alias || macro.name }}
+              </app-macro-btn>
+            </template>
+            <span>{{ macro.config.description }}</span>
+          </v-tooltip>
         </v-expansion-panel-content>
       </v-expansion-panel>
 
@@ -90,19 +99,27 @@
         </v-expansion-panel-header>
 
         <v-expansion-panel-content>
-          <template v-for="macro in uncategorizedMacros">
-            <app-macro-btn
-              :key="`category-${macro.name}`"
-              :macro="macro"
-              :loading="hasWait(`${waits.onMacro}${macro.name}`)"
-              :elevation="2"
-              enable-params
-              class="me-2 mb-2 float-left"
-              @click="sendGcode($event, `${waits.onMacro}${macro.name}`)"
-            >
-              {{ macro.alias || macro.name }}
-            </app-macro-btn>
-          </template>
+          <v-tooltip
+            v-for="macro in uncategorizedMacros"
+            :key="`category-${macro.name}`"
+            bottom
+          >
+            <template #activator="{ on, attrs }">
+              <app-macro-btn
+                v-bind="attrs"
+                :macro="macro"
+                :loading="hasWait(`${waits.onMacro}${macro.name}`)"
+                :elevation="2"
+                enable-params
+                class="me-2 mb-2 float-left"
+                v-on="on"
+                @click="sendGcode($event, `${waits.onMacro}${macro.name}`)"
+              >
+                {{ macro.alias || macro.name }}
+              </app-macro-btn>
+            </template>
+            <span>{{ macro.config.description }}</span>
+          </v-tooltip>
         </v-expansion-panel-content>
       </v-expansion-panel>
     </v-expansion-panels>