diff --git a/extension.json b/extension.json
index 2177322f5..82381fb73 100644
--- a/extension.json
+++ b/extension.json
@@ -62,9 +62,6 @@
 		"PageRenderingHash": [
 			"MathHooks::onPageRenderingHash"
 		],
-		"EditPageBeforeEditToolbar": [
-			"MathHooks::onEditPageBeforeEditToolbar"
-		],
 		"WikibaseClientDataTypes": [
 			"MathWikidataHook::onWikibaseClientDataTypes"
 		],
@@ -142,13 +139,6 @@
 		"ext.math.scripts": {
 			"scripts": "ext.math.js"
 		},
-		"ext.math.editbutton.enabler": {
-			"scripts": "ext.math.editbutton.js",
-			"messages": [
-				"math_tip",
-				"math_sample"
-			]
-		},
 		"ext.math.visualEditor": {
 			"scripts": [
 				"ve-math/ve.dm.MWLatexNode.js",
diff --git a/i18n/en.json b/i18n/en.json
index a04be6783..74b44749f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -78,7 +78,6 @@
 	"math_mathoid_error": "Conversion error. Server (\"$1\") reported: \"$2\"",
 	"math_notexvc": "Missing <code>texvc</code> executable. Please see math/README to configure.",
 	"math_output_error": "Cannot store math image on filesystem.",
-	"math_sample": "Insert formula here",
 	"math-status-introduction" : "This page displays information about the enabled math rendering {{PLURAL:$1|mode|modes}}.\n\nThe following rendering {{PLURAL:$1|mode is|modes are}} enabled:",
 	"math_syntax_error": "syntax error",
 	"math_timeout": "$1 timeout from \"$2\".",
@@ -88,7 +87,6 @@
 	"math-test-success": "Test ''$1'' <span style=\"color:green\">succeeded</span>.",
 	"math-test-contains-diff" : "Returned string $1 does not contain expected string $2.",
 	"math-test-equals-diff" : "Returned string $1 is different from expected string $2.",
-	"math_tip": "Mathematical formula (LaTeX)",
 	"math-tracking-category-error": "Pages with math errors",
 	"math-tracking-category-error-desc": "Pages in this category have errors in the usage of math tags.",
 	"math-tracking-category-render-error": "Pages with math render errors",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 79fe233a9..0c691fe13 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -78,7 +78,6 @@
 	"math_mathoid_error": "Used as error message.\n\nFollows the message {{msg-mw|Math failure}}.\n\nParameters:\n* $1 - hostname\n* $2 - error message retrieved from the server",
 	"math_notexvc": "Used as error message.\n\nThis message follows the message {{msg-mw|Math failure}}.\n\nSee also:\n* {{msg-mw|Math notexvccheck}}",
 	"math_output_error": "Used as error message if the texvc output file could not be stored.\n\nThis message follows the message {{msg-mw|Math failure}}.",
-	"math_sample": "The sample formula text that you get when you press the fourth button from the right on the edit toolbar.",
 	"math-status-introduction": "Used as special-page text.\n\nParameters:\n* $1 mode count",
 	"math_syntax_error": "Used as error message for a texvc syntax error.\n\nThis message follows the message {{msg-mw|Math failure}}.\n{{Identical|Syntax error}}",
 	"math_timeout": "Used as error message.\n\nParameters:\n* $1 - rendering type (either LaTeXML or Mathoid)\n* $2 - hostname or URL",
@@ -88,7 +87,6 @@
 	"math-test-success": "Used as special-page text.\n\nParameters:\n* $1 test name",
 	"math-test-contains-diff": "Used as special-page wikitext.\n\nParameters:\n* $1 syntax highlight element of the returned string \n* $2 syntax highlight element of the expected string",
 	"math-test-equals-diff": "Used as special-page wikitext.\n\nParameters:\n* $1 syntax highlight element of the returned string \n* $2 syntax highlight element of the expected string",
-	"math_tip": "This is the text that appears when you hover the mouse over the fourth button from the right on the edit toolbar.",
 	"math-tracking-category-error": "Tracking category name.",
 	"math-tracking-category-error-desc": "Tracking category description.",
 	"math-tracking-category-render-error": "Tracking category name.",
diff --git a/images/button_math.png b/images/button_math.png
deleted file mode 100644
index 78ea19e52..000000000
Binary files a/images/button_math.png and /dev/null differ
diff --git a/modules/ext.math.editbutton.js b/modules/ext.math.editbutton.js
deleted file mode 100644
index 2db5b383c..000000000
--- a/modules/ext.math.editbutton.js
+++ /dev/null
@@ -1,14 +0,0 @@
-( function ( mw ) {
-	var iconPath;
-	if ( mw.toolbar ) {
-		iconPath = mw.config.get( 'wgExtensionAssetsPath' ) + '/Math/images/';
-		mw.toolbar.addButton( {
-			imageFile: iconPath + 'button_math.png',
-			speedTip: mw.msg( 'math_tip' ),
-			tagOpen: '<math>',
-			tagClose: '</math>',
-			sampleText: mw.msg( 'math_sample' ),
-			imageId: 'mw-editbutton-math'
-		} );
-	}
-}( mediaWiki ) );
diff --git a/src/MathHooks.php b/src/MathHooks.php
index 833f83d37..fd262797b 100644
--- a/src/MathHooks.php
+++ b/src/MathHooks.php
@@ -385,14 +385,6 @@ class MathHooks {
 		return true;
 	}
 
-	/**
-	 * @param string &$toolbar HTML
-	 */
-	public static function onEditPageBeforeEditToolbar( &$toolbar ) {
-		global $wgOut;
-		$wgOut->addModules( [ 'ext.math.editbutton.enabler' ] );
-	}
-
 	public static function registerExtension() {
 		global $wgDefaultUserOptions, $wgMathValidModes, $wgMathDisableTexFilter;
 		$wgMathValidModes = MathRenderer::getValidModes();