diff --git a/editor/plugins/tool_button_editor_plugin.cpp b/editor/plugins/tool_button_editor_plugin.cpp
new file mode 100644
index 000000000000..e091e518eddf
--- /dev/null
+++ b/editor/plugins/tool_button_editor_plugin.cpp
@@ -0,0 +1,99 @@
+/**************************************************************************/
+/*  tool_button_editor_plugin.cpp                                         */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "tool_button_editor_plugin.h"
+
+#include "editor/editor_property_name_processor.h"
+#include "editor/editor_undo_redo_manager.h"
+#include "scene/gui/button.h"
+
+bool ToolButtonInspectorPlugin::can_handle(Object *p_object) {
+	Ref<Script> scr = p_object->get_script();
+	return scr.is_valid() && scr->is_tool();
+}
+
+void ToolButtonInspectorPlugin::update_action_icon(Button *p_action_button) {
+	p_action_button->set_icon(p_action_button->get_editor_theme_icon(action_icon));
+}
+
+void ToolButtonInspectorPlugin::call_action(Object *p_object, const StringName &p_method_name) {
+	bool method_is_valid = false;
+	int method_arg_count = p_object->get_method_argument_count(p_method_name, &method_is_valid);
+
+	ERR_FAIL_COND_MSG(!method_is_valid, vformat("Tool button method is invalid. Could not find method '%s' on %s.", p_method_name, p_object->get_class_name()));
+
+	Variant undo_redo = EditorUndoRedoManager::get_singleton();
+
+	const Variant *args = nullptr;
+	int argc = 0;
+
+	// If the function takes arguments the first argument is always the EditorUndoRedoManager.
+	if (method_arg_count != 0) {
+		args = { &undo_redo };
+		argc = 1;
+	}
+
+	Callable::CallError ce;
+	p_object->callp(p_method_name, &args, argc, ce);
+	ERR_FAIL_COND_MSG(ce.error != Callable::CallError::CALL_OK, vformat("Error calling tool button method on %s: %s.", p_object->get_class_name(), Variant::get_call_error_text(p_method_name, &args, argc, ce)));
+}
+
+bool ToolButtonInspectorPlugin::parse_property(Object *p_object, const Variant::Type p_type, const String &p_path, const PropertyHint p_hint, const String &p_hint_text, const BitField<PropertyUsageFlags> p_usage, const bool p_wide) {
+	if (p_type != Variant::CALLABLE || !p_usage.has_flag(PROPERTY_USAGE_EDITOR)) {
+		return false;
+	}
+
+	const PackedStringArray splits = p_hint_text.split(",");
+	ERR_FAIL_COND_V_MSG(splits.size() < 1, false, "Tool button annotations require a method to call.");
+	const String &method = splits[0];
+	const String &hint_text = splits.size() > 1 ? splits[1] : "";
+	const String &hint_icon = splits.size() > 2 ? splits[2] : "Callable";
+
+	String action_text = hint_text;
+	if (action_text.is_empty()) {
+		action_text = EditorPropertyNameProcessor::get_singleton()->process_name(method, EditorPropertyNameProcessor::STYLE_CAPITALIZED);
+	}
+
+	action_icon = hint_icon;
+
+	Button *action_button = EditorInspector::create_inspector_action_button(action_text);
+	action_button->set_auto_translate_mode(Node::AUTO_TRANSLATE_MODE_DISABLED);
+	action_button->connect(SceneStringName(theme_changed), callable_mp(this, &ToolButtonInspectorPlugin::update_action_icon).bind(action_button));
+	action_button->connect(SceneStringName(pressed), callable_mp(this, &ToolButtonInspectorPlugin::call_action).bind(p_object, method));
+
+	add_custom_control(action_button);
+	return true;
+}
+
+ToolButtonEditorPlugin::ToolButtonEditorPlugin() {
+	Ref<ToolButtonInspectorPlugin> plugin;
+	plugin.instantiate();
+	add_inspector_plugin(plugin);
+}
diff --git a/editor/plugins/tool_button_editor_plugin.h b/editor/plugins/tool_button_editor_plugin.h
new file mode 100644
index 000000000000..027885df374a
--- /dev/null
+++ b/editor/plugins/tool_button_editor_plugin.h
@@ -0,0 +1,57 @@
+/**************************************************************************/
+/*  tool_button_editor_plugin.h                                           */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#ifndef TOOL_BUTTON_EDITOR_PLUGIN_H
+#define TOOL_BUTTON_EDITOR_PLUGIN_H
+
+#include "editor/editor_inspector.h"
+#include "editor/plugins/editor_plugin.h"
+
+class ToolButtonInspectorPlugin : public EditorInspectorPlugin {
+	GDCLASS(ToolButtonInspectorPlugin, EditorInspectorPlugin);
+
+public:
+	StringName action_icon;
+	virtual bool can_handle(Object *p_object) override;
+	virtual bool parse_property(Object *p_object, const Variant::Type p_type, const String &p_path, const PropertyHint p_hint, const String &p_hint_text, const BitField<PropertyUsageFlags> p_usage, const bool p_wide = false) override;
+	void update_action_icon(Button *p_action_button);
+	void call_action(Object *p_object, const StringName &p_method_name);
+};
+
+class ToolButtonEditorPlugin : public EditorPlugin {
+	GDCLASS(ToolButtonEditorPlugin, EditorPlugin);
+
+public:
+	virtual String get_name() const override { return "ToolButtonEditorPlugin"; }
+
+	ToolButtonEditorPlugin();
+};
+
+#endif // TOOL_BUTTON_EDITOR_PLUGIN_H
diff --git a/editor/register_editor_types.cpp b/editor/register_editor_types.cpp
index 00377a0dd28c..19aeeb0612d8 100644
--- a/editor/register_editor_types.cpp
+++ b/editor/register_editor_types.cpp
@@ -127,6 +127,7 @@
 #include "editor/plugins/texture_region_editor_plugin.h"
 #include "editor/plugins/theme_editor_plugin.h"
 #include "editor/plugins/tiles/tiles_editor_plugin.h"
+#include "editor/plugins/tool_button_editor_plugin.h"
 #include "editor/plugins/version_control_editor_plugin.h"
 #include "editor/plugins/visual_shader_editor_plugin.h"
 #include "editor/plugins/voxel_gi_editor_plugin.h"
@@ -247,6 +248,7 @@ void register_editor_types() {
 	EditorPlugins::add_by_type<TextureLayeredEditorPlugin>();
 	EditorPlugins::add_by_type<TextureRegionEditorPlugin>();
 	EditorPlugins::add_by_type<ThemeEditorPlugin>();
+	EditorPlugins::add_by_type<ToolButtonEditorPlugin>();
 	EditorPlugins::add_by_type<VoxelGIEditorPlugin>();
 
 	// 2D
diff --git a/modules/gdscript/doc_classes/@GDScript.xml b/modules/gdscript/doc_classes/@GDScript.xml
index f539f278484f..ad0f94934dfe 100644
--- a/modules/gdscript/doc_classes/@GDScript.xml
+++ b/modules/gdscript/doc_classes/@GDScript.xml
@@ -669,6 +669,36 @@
 				[b]Note:[/b] Subgroups cannot be nested, they only provide one extra level of depth. Just like the next group ends the previous group, so do the subsequent subgroups.
 			</description>
 		</annotation>
+		<annotation name="@export_tool_button">
+			<return type="void" />
+			<param index="0" name="method" type="StringName" />
+			<param index="1" name="text" type="String" default="&quot;&quot;" />
+			<param index="2" name="icon" type="StringName" default="&quot;&quot;" />
+			<description>
+				Add a clickable button to the Inspector. When the button is pressed, the specified [param method] is called.
+				If [param text] is specified it is used as the label text of the button. If [param text] is omitted, the label text is derived from the [param method] name and automatically capitalized.
+				If [param icon] is specified, it is used to fetch an icon for the button via [method Control.get_theme_icon], from the [code]"EditorIcons"[/code] theme type. If [param icon] is omitted, the default [code]"Callable"[/code] icon is used instead.
+				The first argument of the [param method] function is optional and is the [EditorUndoRedoManager]. Consider using the optionally passed [EditorUndoRedoManager] to allow the action to be reverted safely. The code snippet below demonstrates this:
+				[codeblock]
+				@tool
+				extends Sprite2D
+
+				@export_tool_button(&amp;"hello")
+				@export_tool_button(&amp;"randomize_color", "Randomize the color!", &amp;"ColorRect")
+
+				func hello():
+				    print("Hello world!")
+
+				func randomize_color(undo_redo):
+				    undo_redo.create_action("Randomized Sprite2D Color")
+				    undo_redo.add_do_property(self, "self_modulate", Color(randf(), randf(), randf()))
+				    undo_redo.add_undo_property(self, "self_modulate", self_modulate)
+				    undo_redo.commit_action()
+				[/codeblock]
+				[b]Note:[/b] When implementing undo/redo make sure to provide separate [code]do[/code] and [code]undo[/code] methods that perform and revert the action respectively.
+				[b]Note:[/b] In an exported project neither [EditorInterface] nor [EditorUndoRedoManager] exist, which may cause some scripts to break. To prevent this, change the [code]undo_redo[/code] object's type to [Variant] or omit the static type from the declaration.
+			</description>
+		</annotation>
 		<annotation name="@icon">
 			<return type="void" />
 			<param index="0" name="icon_path" type="String" />
diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp
index 7b9aa70686a7..ec42992aec7c 100644
--- a/modules/gdscript/gdscript.cpp
+++ b/modules/gdscript/gdscript.cpp
@@ -567,7 +567,7 @@ bool GDScript::_update_exports(bool *r_err, bool p_recursive_call, PlaceHolderSc
 					case GDScriptParser::ClassNode::Member::SIGNAL: {
 						_signals[member.signal->identifier->name] = member.signal->method_info;
 					} break;
-					case GDScriptParser::ClassNode::Member::GROUP: {
+					case GDScriptParser::ClassNode::Member::META: {
 						members_cache.push_back(member.annotation->export_info);
 					} break;
 					default:
diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp
index 7f0d5005cb0f..8fc2d62c0712 100644
--- a/modules/gdscript/gdscript_analyzer.cpp
+++ b/modules/gdscript/gdscript_analyzer.cpp
@@ -1203,7 +1203,7 @@ void GDScriptAnalyzer::resolve_class_member(GDScriptParser::ClassNode *p_class,
 					resolve_class_inheritance(member.m_class, p_source);
 				}
 				break;
-			case GDScriptParser::ClassNode::Member::GROUP:
+			case GDScriptParser::ClassNode::Member::META:
 				// No-op, but needed to silence warnings.
 				break;
 			case GDScriptParser::ClassNode::Member::UNDEFINED:
@@ -1380,8 +1380,8 @@ void GDScriptAnalyzer::resolve_class_body(GDScriptParser::ClassNode *p_class, co
 					resolve_function_body(member.variable->setter);
 				}
 			}
-		} else if (member.type == GDScriptParser::ClassNode::Member::GROUP) {
-			// Apply annotation (`@export_{category,group,subgroup}`).
+		} else if (member.type == GDScriptParser::ClassNode::Member::META) {
+			// Apply annotation (`@export_{category,group,subgroup}`, `@export_tool_button`).
 			resolve_annotation(member.annotation);
 			member.annotation->apply(parser, nullptr, p_class);
 		}
diff --git a/modules/gdscript/gdscript_compiler.cpp b/modules/gdscript/gdscript_compiler.cpp
index eebf2826336f..9d152dd194b6 100644
--- a/modules/gdscript/gdscript_compiler.cpp
+++ b/modules/gdscript/gdscript_compiler.cpp
@@ -2859,10 +2859,10 @@ Error GDScriptCompiler::_prepare_compilation(GDScript *p_script, const GDScriptP
 				p_script->constants.insert(name, enum_n->dictionary);
 			} break;
 
-			case GDScriptParser::ClassNode::Member::GROUP: {
+			case GDScriptParser::ClassNode::Member::META: {
 				const GDScriptParser::AnnotationNode *annotation = member.annotation;
 				// Avoid name conflict. See GH-78252.
-				StringName name = vformat("@group_%d_%s", p_script->members.size(), annotation->export_info.name);
+				StringName name = vformat("@meta_%d_%s", p_script->members.size(), annotation->export_info.name);
 
 				// This is not a normal member, but we need this to keep indices in order.
 				GDScript::MemberInfo minfo;
@@ -2871,6 +2871,7 @@ Error GDScriptCompiler::_prepare_compilation(GDScript *p_script, const GDScriptP
 				PropertyInfo prop_info;
 				prop_info.name = annotation->export_info.name;
 				prop_info.usage = annotation->export_info.usage;
+				prop_info.type = annotation->export_info.type;
 				prop_info.hint_string = annotation->export_info.hint_string;
 				minfo.property_info = prop_info;
 
diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp
index cf1cd55355c3..f8b4d3772256 100644
--- a/modules/gdscript/gdscript_editor.cpp
+++ b/modules/gdscript/gdscript_editor.cpp
@@ -1126,7 +1126,7 @@ static void _find_identifiers_in_class(const GDScriptParser::ClassNode *p_class,
 						}
 						option = ScriptLanguage::CodeCompletionOption(member.signal->identifier->name, ScriptLanguage::CODE_COMPLETION_KIND_SIGNAL, location);
 						break;
-					case GDScriptParser::ClassNode::Member::GROUP:
+					case GDScriptParser::ClassNode::Member::META:
 						break; // No-op, but silences warnings.
 					case GDScriptParser::ClassNode::Member::UNDEFINED:
 						break;
@@ -2427,7 +2427,7 @@ static bool _guess_identifier_type_from_base(GDScriptParser::CompletionContext &
 							r_type.type.class_type = member.m_class;
 							r_type.type.is_meta_type = true;
 							return true;
-						case GDScriptParser::ClassNode::Member::GROUP:
+						case GDScriptParser::ClassNode::Member::META:
 							return false; // No-op, but silences warnings.
 						case GDScriptParser::ClassNode::Member::UNDEFINED:
 							return false; // Unreachable.
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp
index 65aa150be39a..8452012cea05 100644
--- a/modules/gdscript/gdscript_parser.cpp
+++ b/modules/gdscript/gdscript_parser.cpp
@@ -94,10 +94,11 @@ bool GDScriptParser::annotation_exists(const String &p_annotation_name) const {
 GDScriptParser::GDScriptParser() {
 	// Register valid annotations.
 	if (unlikely(valid_annotations.is_empty())) {
+		// Script annotations.
 		register_annotation(MethodInfo("@tool"), AnnotationInfo::SCRIPT, &GDScriptParser::tool_annotation);
 		register_annotation(MethodInfo("@icon", PropertyInfo(Variant::STRING, "icon_path")), AnnotationInfo::SCRIPT, &GDScriptParser::icon_annotation);
 		register_annotation(MethodInfo("@static_unload"), AnnotationInfo::SCRIPT, &GDScriptParser::static_unload_annotation);
-
+		// Member annotations.
 		register_annotation(MethodInfo("@onready"), AnnotationInfo::VARIABLE, &GDScriptParser::onready_annotation);
 		// Export annotations.
 		register_annotation(MethodInfo("@export"), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_NONE, Variant::NIL>);
@@ -122,6 +123,7 @@ GDScriptParser::GDScriptParser() {
 		register_annotation(MethodInfo("@export_flags_avoidance"), AnnotationInfo::VARIABLE, &GDScriptParser::export_annotations<PROPERTY_HINT_LAYERS_AVOIDANCE, Variant::INT>);
 		register_annotation(MethodInfo("@export_storage"), AnnotationInfo::VARIABLE, &GDScriptParser::export_storage_annotation);
 		register_annotation(MethodInfo("@export_custom", PropertyInfo(Variant::INT, "hint", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_CLASS_IS_ENUM, "PropertyHint"), PropertyInfo(Variant::STRING, "hint_string"), PropertyInfo(Variant::INT, "usage", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_CLASS_IS_BITFIELD, "PropertyUsageFlags")), AnnotationInfo::VARIABLE, &GDScriptParser::export_custom_annotation, varray(PROPERTY_USAGE_DEFAULT));
+		register_annotation(MethodInfo("@export_tool_button", PropertyInfo(Variant::STRING_NAME, "method"), PropertyInfo(Variant::STRING, "text"), PropertyInfo(Variant::STRING_NAME, "icon")), AnnotationInfo::STANDALONE, &GDScriptParser::export_tool_button_annotation, varray("", ""));
 		// Export grouping annotations.
 		register_annotation(MethodInfo("@export_category", PropertyInfo(Variant::STRING, "name")), AnnotationInfo::STANDALONE, &GDScriptParser::export_group_annotations<PROPERTY_USAGE_CATEGORY>);
 		register_annotation(MethodInfo("@export_group", PropertyInfo(Variant::STRING, "name"), PropertyInfo(Variant::STRING, "prefix")), AnnotationInfo::STANDALONE, &GDScriptParser::export_group_annotations<PROPERTY_USAGE_GROUP>, varray(""));
@@ -629,14 +631,14 @@ void GDScriptParser::parse_program() {
 					if (previous.type != GDScriptTokenizer::Token::NEWLINE) {
 						push_error(R"(Expected newline after a standalone annotation.)");
 					}
-					if (annotation->name == SNAME("@export_category") || annotation->name == SNAME("@export_group") || annotation->name == SNAME("@export_subgroup")) {
-						head->add_member_group(annotation);
+					if (annotation->name == SNAME("@export_category") || annotation->name == SNAME("@export_group") || annotation->name == SNAME("@export_subgroup") || annotation->name == SNAME("@export_tool_button")) {
+						head->add_meta_member(annotation);
 						// This annotation must appear after script-level annotations and `class_name`/`extends`,
 						// so we stop looking for script-level stuff.
 						can_have_class_or_extends = false;
 						break;
 					} else {
-						// For potential non-group standalone annotations.
+						// For potential other standalone annotations.
 						push_error(R"(Unexpected standalone annotation.)");
 					}
 				} else {
@@ -1023,10 +1025,10 @@ void GDScriptParser::parse_class_body(bool p_is_multiline) {
 						if (previous.type != GDScriptTokenizer::Token::NEWLINE) {
 							push_error(R"(Expected newline after a standalone annotation.)");
 						}
-						if (annotation->name == SNAME("@export_category") || annotation->name == SNAME("@export_group") || annotation->name == SNAME("@export_subgroup")) {
-							current_class->add_member_group(annotation);
+						if (annotation->name == SNAME("@export_category") || annotation->name == SNAME("@export_group") || annotation->name == SNAME("@export_subgroup") || annotation->name == SNAME("@export_tool_button")) {
+							current_class->add_meta_member(annotation);
 						} else {
-							// For potential non-group standalone annotations.
+							// For potential other standalone annotations.
 							push_error(R"(Unexpected standalone annotation.)");
 						}
 					} else { // `AnnotationInfo::CLASS_LEVEL`.
@@ -4668,12 +4670,66 @@ bool GDScriptParser::export_custom_annotation(AnnotationNode *p_annotation, Node
 	return true;
 }
 
-template <PropertyUsageFlags t_usage>
-bool GDScriptParser::export_group_annotations(AnnotationNode *p_annotation, Node *p_target, ClassNode *p_class) {
-	if (p_annotation->resolved_arguments.is_empty()) {
+bool GDScriptParser::export_tool_button_annotation(AnnotationNode *p_annotation, Node *p_target, ClassNode *p_class) {
+#ifdef TOOLS_ENABLED
+	ERR_FAIL_COND_V(p_annotation->resolved_arguments.is_empty(), false);
+
+	if (!is_tool()) {
+		push_error(R"(Tool buttons can only be used in tool scripts (add "@tool" to the top of the script).)", p_annotation);
+		return false;
+	}
+
+	const StringName method = p_annotation->resolved_arguments[0];
+
+	if (method == StringName()) {
+		push_error(R"(Expected a function name for the "@export_tool_button" method parameter.)", p_annotation);
+		return false;
+	}
+
+	if (!current_class->has_member(method)) {
+		push_error(vformat(R"(The function "%s" could not be found when parsing the "@export_tool_button" method parameter.)", method), p_annotation);
+		return false;
+	}
+
+	const ClassNode::Member &member = current_class->get_member(method);
+
+	if (member.type != ClassNode::Member::FUNCTION) {
+		push_error(vformat(R"(The %s "%s" cannot be used as an "@export_tool_button" method.)", member.get_type_name(), method), p_annotation);
 		return false;
 	}
 
+	const FunctionNode *func = member.function;
+
+	p_annotation->export_info.name = "@tool_button_" + func->identifier->name;
+	p_annotation->export_info.type = Variant::Type::CALLABLE;
+	p_annotation->export_info.usage = PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_INTERNAL;
+
+	if (!func->parameters.is_empty() && func->parameters[0]->datatype_specifier != nullptr) {
+		const DataType arg_type = func->parameters[0]->get_datatype();
+		if (!arg_type.is_variant() && (arg_type.kind != DataType::NATIVE || arg_type.native_type != "EditorUndoRedoManager")) {
+			push_error(R"(Tool button method functions must have a first argument of type "EditorUndoRedoManager".)", p_annotation);
+			return false;
+		}
+	}
+
+	// Build the hint string (format: `<method>[,<text>[,<icon>]]`).
+	String hint_string = method;
+	if (p_annotation->resolved_arguments.size() > 1) {
+		hint_string += "," + p_annotation->resolved_arguments[1].operator String(); // Button text.
+	}
+	if (p_annotation->resolved_arguments.size() > 2) {
+		hint_string += "," + p_annotation->resolved_arguments[2].operator String(); // Button icon.
+	}
+	p_annotation->export_info.hint_string = hint_string;
+#endif // TOOLS_ENABLED
+
+	return true; // Only available in editor.
+}
+
+template <PropertyUsageFlags t_usage>
+bool GDScriptParser::export_group_annotations(AnnotationNode *p_annotation, Node *p_target, ClassNode *p_class) {
+	ERR_FAIL_COND_V(p_annotation->resolved_arguments.is_empty(), false);
+
 	p_annotation->export_info.name = p_annotation->resolved_arguments[0];
 
 	switch (t_usage) {
@@ -5500,8 +5556,8 @@ void GDScriptParser::TreePrinter::print_class(ClassNode *p_class) {
 				break;
 			case ClassNode::Member::ENUM_VALUE:
 				break; // Nothing. Will be printed by enum.
-			case ClassNode::Member::GROUP:
-				break; // Nothing. Groups are only used by inspector.
+			case ClassNode::Member::META:
+				break; // Nothing. Meta properties are only used by the inspector.
 			case ClassNode::Member::UNDEFINED:
 				push_line("<unknown member>");
 				break;
diff --git a/modules/gdscript/gdscript_parser.h b/modules/gdscript/gdscript_parser.h
index 7840474a891e..f7bfaab07c44 100644
--- a/modules/gdscript/gdscript_parser.h
+++ b/modules/gdscript/gdscript_parser.h
@@ -563,7 +563,7 @@ class GDScriptParser {
 				VARIABLE,
 				ENUM,
 				ENUM_VALUE, // For unnamed enums.
-				GROUP, // For member grouping.
+				META, // For exporting groups and tool buttons.
 			};
 
 			Type type = UNDEFINED;
@@ -599,7 +599,7 @@ class GDScriptParser {
 						return m_enum->identifier->name;
 					case ENUM_VALUE:
 						return enum_value.identifier->name;
-					case GROUP:
+					case META:
 						return annotation->export_info.name;
 				}
 				return "";
@@ -623,8 +623,8 @@ class GDScriptParser {
 						return "enum";
 					case ENUM_VALUE:
 						return "enum value";
-					case GROUP:
-						return "group";
+					case META:
+						return "meta property";
 				}
 				return "";
 			}
@@ -645,7 +645,7 @@ class GDScriptParser {
 						return m_enum->start_line;
 					case SIGNAL:
 						return signal->start_line;
-					case GROUP:
+					case META:
 						return annotation->start_line;
 					case UNDEFINED:
 						ERR_FAIL_V_MSG(-1, "Reaching undefined member type.");
@@ -669,7 +669,7 @@ class GDScriptParser {
 						return enum_value.identifier->get_datatype();
 					case SIGNAL:
 						return signal->get_datatype();
-					case GROUP:
+					case META:
 						return DataType();
 					case UNDEFINED:
 						return DataType();
@@ -693,7 +693,7 @@ class GDScriptParser {
 						return enum_value.identifier;
 					case SIGNAL:
 						return signal;
-					case GROUP:
+					case META:
 						return annotation;
 					case UNDEFINED:
 						return nullptr;
@@ -732,7 +732,7 @@ class GDScriptParser {
 				enum_value = p_enum_value;
 			}
 			Member(AnnotationNode *p_annotation) {
-				type = GROUP;
+				type = META;
 				annotation = p_annotation;
 			}
 		};
@@ -786,9 +786,9 @@ class GDScriptParser {
 			members_indices[p_enum_value.identifier->name] = members.size();
 			members.push_back(Member(p_enum_value));
 		}
-		void add_member_group(AnnotationNode *p_annotation_node) {
+		void add_meta_member(AnnotationNode *p_annotation_node) {
 			// Avoid name conflict. See GH-78252.
-			StringName name = vformat("@group_%d_%s", members.size(), p_annotation_node->export_info.name);
+			StringName name = vformat("@meta_%d_%s", members.size(), p_annotation_node->export_info.name);
 			members_indices[name] = members.size();
 			members.push_back(Member(p_annotation_node));
 		}
@@ -1507,6 +1507,7 @@ class GDScriptParser {
 	bool export_annotations(AnnotationNode *p_annotation, Node *p_target, ClassNode *p_class);
 	bool export_storage_annotation(AnnotationNode *p_annotation, Node *p_target, ClassNode *p_class);
 	bool export_custom_annotation(AnnotationNode *p_annotation, Node *p_target, ClassNode *p_class);
+	bool export_tool_button_annotation(AnnotationNode *p_annotation, Node *p_target, ClassNode *p_class);
 	template <PropertyUsageFlags t_usage>
 	bool export_group_annotations(AnnotationNode *p_annotation, Node *p_target, ClassNode *p_class);
 	bool warning_annotations(AnnotationNode *p_annotation, Node *p_target, ClassNode *p_class);
diff --git a/modules/gdscript/language_server/gdscript_extend_parser.cpp b/modules/gdscript/language_server/gdscript_extend_parser.cpp
index 2a3db4f508d5..25f87b70cd20 100644
--- a/modules/gdscript/language_server/gdscript_extend_parser.cpp
+++ b/modules/gdscript/language_server/gdscript_extend_parser.cpp
@@ -454,7 +454,7 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 				parse_class_symbol(m.m_class, symbol);
 				r_symbol.children.push_back(symbol);
 			} break;
-			case ClassNode::Member::GROUP:
+			case ClassNode::Member::META:
 				break; // No-op, but silences warnings.
 			case ClassNode::Member::UNDEFINED:
 				break; // Unreachable.
@@ -988,7 +988,7 @@ Dictionary ExtendGDScriptParser::dump_class_api(const GDScriptParser::ClassNode
 					methods.append(dump_function_api(m.function));
 				}
 			} break;
-			case ClassNode::Member::GROUP:
+			case ClassNode::Member::META:
 				break; // No-op, but silences warnings.
 			case ClassNode::Member::UNDEFINED:
 				break; // Unreachable.
diff --git a/modules/gdscript/tests/scripts/parser/errors/export_tool_button_bad_argument_type.gd b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_bad_argument_type.gd
new file mode 100644
index 000000000000..d7b0a5e9ecb0
--- /dev/null
+++ b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_bad_argument_type.gd
@@ -0,0 +1,5 @@
+@tool
+@export_tool_button("foo")
+
+func foo(n: int):
+	pass
diff --git a/modules/gdscript/tests/scripts/parser/errors/export_tool_button_bad_argument_type.out b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_bad_argument_type.out
new file mode 100644
index 000000000000..9a302f9adae5
--- /dev/null
+++ b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_bad_argument_type.out
@@ -0,0 +1,2 @@
+GDTEST_ANALYZER_ERROR
+Tool button method functions must have a first argument of type "EditorUndoRedoManager".
diff --git a/modules/gdscript/tests/scripts/parser/errors/export_tool_button_missing_implementation.gd b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_missing_implementation.gd
new file mode 100644
index 000000000000..393501f12dbf
--- /dev/null
+++ b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_missing_implementation.gd
@@ -0,0 +1,2 @@
+@tool
+@export_tool_button("foo")
diff --git a/modules/gdscript/tests/scripts/parser/errors/export_tool_button_missing_implementation.out b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_missing_implementation.out
new file mode 100644
index 000000000000..7275fc8f7dc8
--- /dev/null
+++ b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_missing_implementation.out
@@ -0,0 +1,2 @@
+GDTEST_ANALYZER_ERROR
+The function "foo" could not be found when parsing the "@export_tool_button" method parameter.
diff --git a/modules/gdscript/tests/scripts/parser/errors/export_tool_button_not_a_function.gd b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_not_a_function.gd
new file mode 100644
index 000000000000..08350602353d
--- /dev/null
+++ b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_not_a_function.gd
@@ -0,0 +1,4 @@
+@tool
+@export_tool_button("foo")
+
+var foo:int
diff --git a/modules/gdscript/tests/scripts/parser/errors/export_tool_button_not_a_function.out b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_not_a_function.out
new file mode 100644
index 000000000000..c9d80f2cff55
--- /dev/null
+++ b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_not_a_function.out
@@ -0,0 +1,2 @@
+GDTEST_ANALYZER_ERROR
+The variable "foo" cannot be used as an "@export_tool_button" method.
diff --git a/modules/gdscript/tests/scripts/parser/errors/export_tool_button_requires_method.gd b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_requires_method.gd
new file mode 100644
index 000000000000..818e7fbb677b
--- /dev/null
+++ b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_requires_method.gd
@@ -0,0 +1,2 @@
+@tool
+@export_tool_button("")
diff --git a/modules/gdscript/tests/scripts/parser/errors/export_tool_button_requires_method.out b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_requires_method.out
new file mode 100644
index 000000000000..da0840b1352d
--- /dev/null
+++ b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_requires_method.out
@@ -0,0 +1,2 @@
+GDTEST_ANALYZER_ERROR
+Expected a function name for the "@export_tool_button" method parameter.
diff --git a/modules/gdscript/tests/scripts/parser/errors/export_tool_button_requires_tool_mode.gd b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_requires_tool_mode.gd
new file mode 100644
index 000000000000..dc59c541e194
--- /dev/null
+++ b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_requires_tool_mode.gd
@@ -0,0 +1 @@
+@export_tool_button("foo")
diff --git a/modules/gdscript/tests/scripts/parser/errors/export_tool_button_requires_tool_mode.out b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_requires_tool_mode.out
new file mode 100644
index 000000000000..fb148308e4b3
--- /dev/null
+++ b/modules/gdscript/tests/scripts/parser/errors/export_tool_button_requires_tool_mode.out
@@ -0,0 +1,2 @@
+GDTEST_ANALYZER_ERROR
+Tool buttons can only be used in tool scripts (add "@tool" to the top of the script).