diff --git a/dist/mathml-block.js b/dist/mathml-block.js
index 4549daab..1f209f15 100644
--- a/dist/mathml-block.js
+++ b/dist/mathml-block.js
@@ -1 +1 @@
-!function(t){var e={};function n(r){if(e[r])return e[r].exports;var o=e[r]={i:r,l:!1,exports:{}};return t[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var o in t)n.d(r,o,function(e){return t[e]}.bind(null,o));return r},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=1)}([function(t,e,n){"use strict";t.exports=function(t){var e=[];return e.toString=function(){return this.map((function(e){var n=function(t,e){var n=t[1]||"",r=t[3];if(!r)return n;if(e&&"function"==typeof btoa){var o=(i=r,c=btoa(unescape(encodeURIComponent(JSON.stringify(i)))),u="sourceMappingURL=data:application/json;charset=utf-8;base64,".concat(c),"/*# ".concat(u," */")),a=r.sources.map((function(t){return"/*# sourceURL=".concat(r.sourceRoot||"").concat(t," */")}));return[n].concat(a).concat([o]).join("\n")}var i,c,u;return[n].join("\n")}(e,t);return e[2]?"@media ".concat(e[2]," {").concat(n,"}"):n})).join("")},e.i=function(t,n,r){"string"==typeof t&&(t=[[null,t,""]]);var o={};if(r)for(var a=0;a<this.length;a++){var i=this[a][0];null!=i&&(o[i]=!0)}for(var c=0;c<t.length;c++){var u=[].concat(t[c]);r&&o[u[0]]||(n&&(u[2]?u[2]="".concat(n," and ").concat(u[2]):u[2]=n),e.push(u))}},e}},function(t,e,n){n(6),t.exports=n(2)},function(t,e,n){"use strict";n.r(e);n(3);var r=window.wp.element,o=r.createElement,a=r.Fragment,i=window.wp.richText,c=i.registerFormatType,u=i.toggleFormat,s=window.wp.blockEditor,l=s.RichTextToolbarButton,f=s.RichTextShortcut;[{name:"mathml",title:(0,window.wp.i18n.__)("MathML","mathml-block"),character:"m"}].forEach((function(t){var e=t.name,n=t.title,r=t.character,i="mathml-block/".concat(e);c(i,{title:n,tagName:e,className:null,edit:function(t){var c=t.isActive,s=t.value,d=t.onChange,m=function(){d(u(s,{type:i})),setTimeout((function(){MathJax.Hub.Queue(["Typeset",MathJax.Hub,document.getElementsByTagName("mathml")])}),100)};return o(a,null,o(f,{type:"primary",character:r,onUse:m}),o(l,{title:n,onClick:m,isActive:c,shortcutType:"primary",shortcutCharacter:r,className:"toolbar-button-with-text toolbar-button__advanced-".concat(e)}))}})}))},function(t,e,n){var r=n(4),o=n(5);"string"==typeof(o=o.__esModule?o.default:o)&&(o=[[t.i,o,""]]);var a={insert:"head",singleton:!1};r(o,a);t.exports=o.locals||{}},function(t,e,n){"use strict";var r,o=function(){return void 0===r&&(r=Boolean(window&&document&&document.all&&!window.atob)),r},a=function(){var t={};return function(e){if(void 0===t[e]){var n=document.querySelector(e);if(window.HTMLIFrameElement&&n instanceof window.HTMLIFrameElement)try{n=n.contentDocument.head}catch(t){n=null}t[e]=n}return t[e]}}(),i=[];function c(t){for(var e=-1,n=0;n<i.length;n++)if(i[n].identifier===t){e=n;break}return e}function u(t,e){for(var n={},r=[],o=0;o<t.length;o++){var a=t[o],u=e.base?a[0]+e.base:a[0],s=n[u]||0,l="".concat(u," ").concat(s);n[u]=s+1;var f=c(l),d={css:a[1],media:a[2],sourceMap:a[3]};-1!==f?(i[f].references++,i[f].updater(d)):i.push({identifier:l,updater:h(d,e),references:1}),r.push(l)}return r}function s(t){var e=document.createElement("style"),r=t.attributes||{};if(void 0===r.nonce){var o=n.nc;o&&(r.nonce=o)}if(Object.keys(r).forEach((function(t){e.setAttribute(t,r[t])})),"function"==typeof t.insert)t.insert(e);else{var i=a(t.insert||"head");if(!i)throw new Error("Couldn't find a style target. This probably means that the value for the 'insert' parameter is invalid.");i.appendChild(e)}return e}var l,f=(l=[],function(t,e){return l[t]=e,l.filter(Boolean).join("\n")});function d(t,e,n,r){var o=n?"":r.media?"@media ".concat(r.media," {").concat(r.css,"}"):r.css;if(t.styleSheet)t.styleSheet.cssText=f(e,o);else{var a=document.createTextNode(o),i=t.childNodes;i[e]&&t.removeChild(i[e]),i.length?t.insertBefore(a,i[e]):t.appendChild(a)}}function m(t,e,n){var r=n.css,o=n.media,a=n.sourceMap;if(o?t.setAttribute("media",o):t.removeAttribute("media"),a&&btoa&&(r+="\n/*# sourceMappingURL=data:application/json;base64,".concat(btoa(unescape(encodeURIComponent(JSON.stringify(a))))," */")),t.styleSheet)t.styleSheet.cssText=r;else{for(;t.firstChild;)t.removeChild(t.firstChild);t.appendChild(document.createTextNode(r))}}var p=null,v=0;function h(t,e){var n,r,o;if(e.singleton){var a=v++;n=p||(p=s(e)),r=d.bind(null,n,a,!1),o=d.bind(null,n,a,!0)}else n=s(e),r=m.bind(null,n,e),o=function(){!function(t){if(null===t.parentNode)return!1;t.parentNode.removeChild(t)}(n)};return r(t),function(e){if(e){if(e.css===t.css&&e.media===t.media&&e.sourceMap===t.sourceMap)return;r(t=e)}else o()}}t.exports=function(t,e){(e=e||{}).singleton||"boolean"==typeof e.singleton||(e.singleton=o());var n=u(t=t||[],e);return function(t){if(t=t||[],"[object Array]"===Object.prototype.toString.call(t)){for(var r=0;r<n.length;r++){var o=c(n[r]);i[o].references--}for(var a=u(t,e),s=0;s<n.length;s++){var l=c(n[s]);0===i[l].references&&(i[l].updater(),i.splice(l,1))}n=a}}}},function(t,e,n){"use strict";n.r(e);var r=n(0),o=n.n(r)()(!1);o.push([t.i,".toolbar-button__advanced-mathml:before {\n\tcontent: 'M';\n}",""]),e.default=o},function(t,e,n){"use strict";n.r(e);var r="undefined"!=typeof crypto&&crypto.getRandomValues&&crypto.getRandomValues.bind(crypto)||"undefined"!=typeof msCrypto&&"function"==typeof msCrypto.getRandomValues&&msCrypto.getRandomValues.bind(msCrypto),o=new Uint8Array(16);function a(){if(!r)throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");return r(o)}var i=/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i;for(var c=function(t){return"string"==typeof t&&i.test(t)},u=[],s=0;s<256;++s)u.push((s+256).toString(16).substr(1));var l=function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=(u[t[e+0]]+u[t[e+1]]+u[t[e+2]]+u[t[e+3]]+"-"+u[t[e+4]]+u[t[e+5]]+"-"+u[t[e+6]]+u[t[e+7]]+"-"+u[t[e+8]]+u[t[e+9]]+"-"+u[t[e+10]]+u[t[e+11]]+u[t[e+12]]+u[t[e+13]]+u[t[e+14]]+u[t[e+15]]).toLowerCase();if(!c(n))throw TypeError("Stringified UUID is invalid");return n};var f=function(t,e,n){var r=(t=t||{}).random||(t.rng||a)();if(r[6]=15&r[6]|64,r[8]=63&r[8]|128,e){n=n||0;for(var o=0;o<16;++o)e[n+o]=r[o];return e}return l(r)},d=wp.i18n.__,m=wp.blocks.registerBlockType;m("mathml/mathmlblock",{title:"MathML",icon:"list-view",category:"common",attributes:{formula:{source:"html",selector:"div",type:"string"}},edit:function(t){var e=t.isSelected,n=t.attributes,r=t.setAttributes,o=t.className,a=n.formula,i=f();return function(t){setTimeout((function(){MathJax.Hub.Queue(["Typeset",MathJax.Hub,document.getElementById(t)])}),100)}(i),e?React.createElement("div",{className:o},React.createElement("label",{htmlFor:i},d("MathML formula:","mathml-block")),React.createElement("textarea",{id:i,className:"mathml-formula",tagname:"div",onChange:function(t){r({formula:t.target.value})},value:a,style:{width:"100%"}})):React.createElement("div",{id:i,className:"mathml-block"},a)},save:function(t){var e=t.attributes,n=t.className,r=e.formula;return React.createElement("div",{className:n},r)}})}]);
\ No newline at end of file
+!function(t){var e={};function n(r){if(e[r])return e[r].exports;var o=e[r]={i:r,l:!1,exports:{}};return t[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var o in t)n.d(r,o,function(e){return t[e]}.bind(null,o));return r},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=2)}([function(t,e,n){"use strict";var r=wp.primitives,o=r.SVG,a=r.Path;e.a=React.createElement(o,{xmlns:"http://www.w3.org/2000/svg",viewBox:"0 0 24 24"},React.createElement(a,{d:"M 5 19.355 L 12.755 12.209 L 5.157 4.464 L 5.157 4 L 18.28 4 L 18.28 8.405 L 17.821 8.405 C 17.701 7.046 17.275 6.125 16.543 5.642 C 15.773 5.181 14.754 4.959 13.484 4.974 L 8.553 4.974 L 14.772 11.677 L 8.115 17.769 L 16.498 17.769 C 17.111 17.754 17.507 17.501 17.686 17.011 C 17.843 16.543 17.921 16.041 17.921 15.505 L 18.381 15.505 L 18.381 20 L 5 20 L 5 19.355 Z"}))},function(t,e,n){"use strict";t.exports=function(t){var e=[];return e.toString=function(){return this.map((function(e){var n=function(t,e){var n=t[1]||"",r=t[3];if(!r)return n;if(e&&"function"==typeof btoa){var o=(i=r,c=btoa(unescape(encodeURIComponent(JSON.stringify(i)))),u="sourceMappingURL=data:application/json;charset=utf-8;base64,".concat(c),"/*# ".concat(u," */")),a=r.sources.map((function(t){return"/*# sourceURL=".concat(r.sourceRoot||"").concat(t," */")}));return[n].concat(a).concat([o]).join("\n")}var i,c,u;return[n].join("\n")}(e,t);return e[2]?"@media ".concat(e[2]," {").concat(n,"}"):n})).join("")},e.i=function(t,n,r){"string"==typeof t&&(t=[[null,t,""]]);var o={};if(r)for(var a=0;a<this.length;a++){var i=this[a][0];null!=i&&(o[i]=!0)}for(var c=0;c<t.length;c++){var u=[].concat(t[c]);r&&o[u[0]]||(n&&(u[2]?u[2]="".concat(n," and ").concat(u[2]):u[2]=n),e.push(u))}},e}},function(t,e,n){n(7),t.exports=n(3)},function(t,e,n){"use strict";n.r(e);var r=n(0),o=(n(4),window.wp.element),a=o.createElement,i=o.Fragment,c=window.wp.richText,u=c.registerFormatType,s=c.toggleFormat,l=window.wp.blockEditor,f=l.RichTextToolbarButton,d=l.RichTextShortcut;[{name:"mathml",title:(0,window.wp.i18n.__)("MathML","mathml-block"),character:"m"}].forEach((function(t){var e=t.name,n=t.title,o=t.character,c="mathml-block/".concat(e);u(c,{title:n,tagName:e,className:null,edit:function(t){var u=t.isActive,l=t.value,m=t.onChange,p=function(){m(s(l,{type:c})),setTimeout((function(){MathJax.Hub.Queue(["Typeset",MathJax.Hub,document.getElementsByTagName("mathml")])}),100)};return a(i,null,a(d,{type:"primary",character:o,onUse:p}),a(f,{title:n,icon:r.a,onClick:p,isActive:u,shortcutType:"primary",shortcutCharacter:o,className:"toolbar-button-with-text toolbar-button__advanced-".concat(e)}))}})}))},function(t,e,n){var r=n(5),o=n(6);"string"==typeof(o=o.__esModule?o.default:o)&&(o=[[t.i,o,""]]);var a={insert:"head",singleton:!1};r(o,a);t.exports=o.locals||{}},function(t,e,n){"use strict";var r,o=function(){return void 0===r&&(r=Boolean(window&&document&&document.all&&!window.atob)),r},a=function(){var t={};return function(e){if(void 0===t[e]){var n=document.querySelector(e);if(window.HTMLIFrameElement&&n instanceof window.HTMLIFrameElement)try{n=n.contentDocument.head}catch(t){n=null}t[e]=n}return t[e]}}(),i=[];function c(t){for(var e=-1,n=0;n<i.length;n++)if(i[n].identifier===t){e=n;break}return e}function u(t,e){for(var n={},r=[],o=0;o<t.length;o++){var a=t[o],u=e.base?a[0]+e.base:a[0],s=n[u]||0,l="".concat(u," ").concat(s);n[u]=s+1;var f=c(l),d={css:a[1],media:a[2],sourceMap:a[3]};-1!==f?(i[f].references++,i[f].updater(d)):i.push({identifier:l,updater:h(d,e),references:1}),r.push(l)}return r}function s(t){var e=document.createElement("style"),r=t.attributes||{};if(void 0===r.nonce){var o=n.nc;o&&(r.nonce=o)}if(Object.keys(r).forEach((function(t){e.setAttribute(t,r[t])})),"function"==typeof t.insert)t.insert(e);else{var i=a(t.insert||"head");if(!i)throw new Error("Couldn't find a style target. This probably means that the value for the 'insert' parameter is invalid.");i.appendChild(e)}return e}var l,f=(l=[],function(t,e){return l[t]=e,l.filter(Boolean).join("\n")});function d(t,e,n,r){var o=n?"":r.media?"@media ".concat(r.media," {").concat(r.css,"}"):r.css;if(t.styleSheet)t.styleSheet.cssText=f(e,o);else{var a=document.createTextNode(o),i=t.childNodes;i[e]&&t.removeChild(i[e]),i.length?t.insertBefore(a,i[e]):t.appendChild(a)}}function m(t,e,n){var r=n.css,o=n.media,a=n.sourceMap;if(o?t.setAttribute("media",o):t.removeAttribute("media"),a&&btoa&&(r+="\n/*# sourceMappingURL=data:application/json;base64,".concat(btoa(unescape(encodeURIComponent(JSON.stringify(a))))," */")),t.styleSheet)t.styleSheet.cssText=r;else{for(;t.firstChild;)t.removeChild(t.firstChild);t.appendChild(document.createTextNode(r))}}var p=null,v=0;function h(t,e){var n,r,o;if(e.singleton){var a=v++;n=p||(p=s(e)),r=d.bind(null,n,a,!1),o=d.bind(null,n,a,!0)}else n=s(e),r=m.bind(null,n,e),o=function(){!function(t){if(null===t.parentNode)return!1;t.parentNode.removeChild(t)}(n)};return r(t),function(e){if(e){if(e.css===t.css&&e.media===t.media&&e.sourceMap===t.sourceMap)return;r(t=e)}else o()}}t.exports=function(t,e){(e=e||{}).singleton||"boolean"==typeof e.singleton||(e.singleton=o());var n=u(t=t||[],e);return function(t){if(t=t||[],"[object Array]"===Object.prototype.toString.call(t)){for(var r=0;r<n.length;r++){var o=c(n[r]);i[o].references--}for(var a=u(t,e),s=0;s<n.length;s++){var l=c(n[s]);0===i[l].references&&(i[l].updater(),i.splice(l,1))}n=a}}}},function(t,e,n){"use strict";n.r(e);var r=n(1),o=n.n(r)()(!1);o.push([t.i,".toolbar-button__advanced-mathml:before {\n\tcontent: 'M';\n}",""]),e.default=o},function(t,e,n){"use strict";n.r(e);var r="undefined"!=typeof crypto&&crypto.getRandomValues&&crypto.getRandomValues.bind(crypto)||"undefined"!=typeof msCrypto&&"function"==typeof msCrypto.getRandomValues&&msCrypto.getRandomValues.bind(msCrypto),o=new Uint8Array(16);function a(){if(!r)throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");return r(o)}var i=/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i;for(var c=function(t){return"string"==typeof t&&i.test(t)},u=[],s=0;s<256;++s)u.push((s+256).toString(16).substr(1));var l=function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=(u[t[e+0]]+u[t[e+1]]+u[t[e+2]]+u[t[e+3]]+"-"+u[t[e+4]]+u[t[e+5]]+"-"+u[t[e+6]]+u[t[e+7]]+"-"+u[t[e+8]]+u[t[e+9]]+"-"+u[t[e+10]]+u[t[e+11]]+u[t[e+12]]+u[t[e+13]]+u[t[e+14]]+u[t[e+15]]).toLowerCase();if(!c(n))throw TypeError("Stringified UUID is invalid");return n};var f=function(t,e,n){var r=(t=t||{}).random||(t.rng||a)();if(r[6]=15&r[6]|64,r[8]=63&r[8]|128,e){n=n||0;for(var o=0;o<16;++o)e[n+o]=r[o];return e}return l(r)},d=n(0),m=wp.i18n.__,p=wp.blocks.registerBlockType;p("mathml/mathmlblock",{title:"MathML",icon:d.a,category:"common",attributes:{formula:{source:"html",selector:"div",type:"string"}},edit:function(t){var e=t.isSelected,n=t.attributes,r=t.setAttributes,o=t.className,a=n.formula,i=f();return function(t){setTimeout((function(){MathJax.Hub.Queue(["Typeset",MathJax.Hub,document.getElementById(t)])}),100)}(i),e?React.createElement("div",{className:o},React.createElement("label",{htmlFor:i},m("MathML formula:","mathml-block")),React.createElement("textarea",{id:i,className:"mathml-formula",tagname:"div",onChange:function(t){r({formula:t.target.value})},value:a,style:{width:"100%"}})):React.createElement("div",{id:i,className:"mathml-block"},a)},save:function(t){var e=t.attributes,n=t.className,r=e.formula;return React.createElement("div",{className:n},r)}})}]);
\ No newline at end of file
diff --git a/src/icon.js b/src/icon.js
new file mode 100644
index 00000000..1b4a730d
--- /dev/null
+++ b/src/icon.js
@@ -0,0 +1,7 @@
+const { SVG, Path } = wp.primitives;
+
+export default (
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+		<Path d="M 5 19.355 L 12.755 12.209 L 5.157 4.464 L 5.157 4 L 18.28 4 L 18.28 8.405 L 17.821 8.405 C 17.701 7.046 17.275 6.125 16.543 5.642 C 15.773 5.181 14.754 4.959 13.484 4.974 L 8.553 4.974 L 14.772 11.677 L 8.115 17.769 L 16.498 17.769 C 17.111 17.754 17.507 17.501 17.686 17.011 C 17.843 16.543 17.921 16.041 17.921 15.505 L 18.381 15.505 L 18.381 20 L 5 20 L 5 19.355 Z" />
+	</SVG>
+);
diff --git a/src/mathml-block.js b/src/mathml-block.js
index 5b56a22c..0ad2321a 100644
--- a/src/mathml-block.js
+++ b/src/mathml-block.js
@@ -1,4 +1,5 @@
 import { v4 as uuid } from 'uuid';
+import icon from './icon';
 
 const { __ }                = wp.i18n;
 const { registerBlockType } = wp.blocks;
@@ -11,7 +12,7 @@ const renderMathML = ( id ) => {
 
 registerBlockType( 'mathml/mathmlblock', {
 	title: 'MathML',
-	icon: 'list-view',
+	icon,
 	category: 'common',
 	attributes: {
 		formula: {
diff --git a/src/mathml-inline.js b/src/mathml-inline.js
index 916802bf..e32c0b7d 100644
--- a/src/mathml-inline.js
+++ b/src/mathml-inline.js
@@ -1,3 +1,4 @@
+import icon from './icon';
 const { createElement, Fragment } = window.wp.element;
 const { registerFormatType, toggleFormat } = window.wp.richText;
 const { RichTextToolbarButton, RichTextShortcut } = window.wp.blockEditor;
@@ -34,6 +35,7 @@ import './mathml-block.css';
 					} ),
 					createElement( RichTextToolbarButton, {
 						title,
+						icon,
 						onClick: onToggle,
 						isActive,
 						shortcutType: 'primary',