diff --git a/src/components/ButtonSelect.tsx b/src/components/ButtonSelect.tsx
index f7cc1a5d5..c47ff65e7 100644
--- a/src/components/ButtonSelect.tsx
+++ b/src/components/ButtonSelect.tsx
@@ -23,17 +23,7 @@ export const ButtonSelect = <T extends Object>({
           onChange={() => onChange(option.value)}
           checked={value === option.value}
         />
-        <span
-          style={{
-            textAlign: "center",
-            fontSize: "0.6rem",
-            color: "var(--icon-fill-color)",
-            fontWeight: "bold",
-            opacity: value === option.value ? 1.0 : 0.6,
-          }}
-        >
-          {option.text}
-        </span>
+        {option.text}
       </label>
     ))}
   </div>
diff --git a/src/components/Subtypes.tsx b/src/components/Subtypes.tsx
index def8b9675..2a9adb089 100644
--- a/src/components/Subtypes.tsx
+++ b/src/components/Subtypes.tsx
@@ -1,7 +1,6 @@
 import { getShortcutKey, updateActiveTool } from "../utils";
 import { t } from "../i18n";
 import { Action } from "../actions/types";
-import { ToolButton } from "./ToolButton";
 import clsx from "clsx";
 import {
   Subtype,
@@ -74,17 +73,13 @@ export const SubtypeButton = (
     },
     keyTest,
     PanelComponent: ({ elements, appState, updateData, data }) => (
-      <ToolButton
-        type="icon"
-        icon={icon.call(this, { theme: appState.theme })}
-        selected={
-          appState.activeSubtypes !== undefined &&
-          appState.activeSubtypes.includes(subtype)
-        }
-        className={clsx({
-          selected:
-            appState.activeSubtypes &&
+      <button
+        className={clsx("ToolIcon_type_button", "ToolIcon_type_button--show", {
+          ToolIcon: true,
+          "ToolIcon--selected":
+            appState.activeSubtypes !== undefined &&
             appState.activeSubtypes.includes(subtype),
+          "ToolIcon--plain": true,
         })}
         title={`${t(`toolBar.${subtype}`)}${title}`}
         aria-label={t(`toolBar.${subtype}`)}
@@ -105,8 +100,13 @@ export const SubtypeButton = (
               }
             : undefined
         }
-        size={data?.size || "medium"}
-      ></ToolButton>
+      >
+        {
+          <div className="ToolIcon__icon" aria-hidden="true">
+            {icon.call(this, { theme: appState.theme })}
+          </div>
+        }
+      </button>
     ),
   };
   if (key === "") {
diff --git a/src/components/ToolButton.tsx b/src/components/ToolButton.tsx
index f3d7098f7..446d154df 100644
--- a/src/components/ToolButton.tsx
+++ b/src/components/ToolButton.tsx
@@ -43,7 +43,6 @@ type ToolButtonProps =
       type: "icon";
       children?: React.ReactNode;
       onClick?(): void;
-      onContextMenu?: React.MouseEventHandler;
     })
   | (ToolButtonBaseProps & {
       type: "radio";
@@ -121,7 +120,6 @@ export const ToolButton = React.forwardRef((props: ToolButtonProps, ref) => {
         aria-label={props["aria-label"]}
         type={type}
         onClick={onClick}
-        onContextMenu={props.type === "icon" ? props.onContextMenu : undefined}
         ref={innerRef}
         disabled={isLoading || props.isLoading}
       >
diff --git a/src/packages/extensions/ts/mathjax/implementation.tsx b/src/packages/extensions/ts/mathjax/implementation.tsx
index d3d23a39b..b271a9f6e 100644
--- a/src/packages/extensions/ts/mathjax/implementation.tsx
+++ b/src/packages/extensions/ts/mathjax/implementation.tsx
@@ -35,7 +35,7 @@ import {
   getNonDeletedElements,
   redrawTextBoundingBox,
 } from "../../../../element";
-import { ButtonSelect } from "../../../../components/ButtonSelect";
+import { ButtonIconSelect } from "../../../../components/ButtonIconSelect";
 
 // Subtype imports
 import {
@@ -1433,38 +1433,55 @@ const createMathActions = () => {
         commitToHistory: true,
       };
     },
-    PanelComponent: ({ elements, appState, updateData }) => (
-      <fieldset>
-        <legend>{t("labels.changeMathOnly")}</legend>
-        <ButtonSelect
-          group="mathOnly"
-          options={[
-            {
-              value: false,
-              text: t("labels.mathOnlyFalse"),
-            },
-            {
-              value: true,
-              text: t("labels.mathOnlyTrue"),
-            },
-          ]}
-          value={getFormValue(
-            elements,
-            appState,
-            (element) => {
-              const el = hasBoundTextElement(element)
-                ? getBoundTextElement(element)
-                : element;
-              return isMathElement(el)
-                ? getMathProps.ensureMathProps(el.customData).mathOnly
-                : null;
-            },
-            getMathProps.getMathOnly(appState),
-          )}
-          onChange={(value) => updateData(value)}
-        />
-      </fieldset>
-    ),
+    PanelComponent: ({ elements, appState, updateData }) => {
+      const textIcon = (text: string, selected: boolean) => {
+        const color = selected
+          ? "var(--button-color, var(--color-primary-darker))"
+          : "var(--button-color, var(--text-primary-color))";
+        return (
+          <div className="buttonList">
+            <span style={{ textAlign: "center", fontSize: "0.6rem", color }}>
+              {text.replace(" ", "\n")}
+            </span>
+          </div>
+        );
+      };
+      const value = getFormValue(
+        elements,
+        appState,
+        (element) => {
+          const el = hasBoundTextElement(element)
+            ? getBoundTextElement(element)
+            : element;
+          return isMathElement(el)
+            ? getMathProps.ensureMathProps(el.customData).mathOnly
+            : null;
+        },
+        getMathProps.getMathOnly(appState),
+      );
+      return (
+        <fieldset>
+          <legend>{t("labels.changeMathOnly")}</legend>
+          <ButtonIconSelect
+            group="mathOnly"
+            options={[
+              {
+                value: false,
+                text: t("labels.mathOnlyFalse"),
+                icon: textIcon(t("labels.mathOnlyFalse"), value === false),
+              },
+              {
+                value: true,
+                text: t("labels.mathOnlyTrue"),
+                icon: textIcon(t("labels.mathOnlyTrue"), value === true),
+              },
+            ]}
+            value={value}
+            onChange={(value) => updateData(value)}
+          />
+        </fieldset>
+      );
+    },
     predicate: (...rest) =>
       rest[4] === undefined && enableActionChangeMathProps(rest[0], rest[1]),
     trackEvent: false,