diff --git a/customize.dist/src/less2/include/markdown.less b/customize.dist/src/less2/include/markdown.less
index 4147dbcbd..5d1386936 100644
--- a/customize.dist/src/less2/include/markdown.less
+++ b/customize.dist/src/less2/include/markdown.less
@@ -291,20 +291,28 @@
 
 //reusable styling for the markdown toggle button across all apps
 .markdown-toolbar-button-style() {
-    padding: 3px 5px;
+    padding: 0px 5px;
     height: fit-content;
     margin: 0;
-    line-height: 1;
+    line-height: unset;
     border-radius: @variables_radius;
     display: inline-flex;
+    gap: 5px;
+    text-transform: uppercase;
     background-color: @cp_toolbar-bottom-bg;
+    border: 1px solid @cp_toolbar-bottom-bg;
     color: @cp_toolbar-bottom-fg;
+    align-items: center;
 
     &:hover {
         background-color: fade(@cryptpad_text_col, 20%);
         border-color: @cryptpad_text_col;
         color: @cryptpad_text_col;
     }
+    &:focus-visible {
+        outline: @variables_focus_style;
+        box-shadow: unset;
+    }
 
     &.cp-toolbar-button-active {
         background-color: @cp_toolbar-bg;
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index b5b26b0d9..002b283ef 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1312,14 +1312,14 @@ define([
 
         var toolbarVisibleOnSmallScreen = false;
 
-        const $toolbarToggleButton = $(h('button.btn.cp-markdown-toggle-button', {
+        const $toolbarToggleButton = $(h('button.cp-markdown-toggle-button', {
             'aria-label': Messages.toolbar_show_text_tools,
             'aria-pressed': 'false',
             'data-notippy': 1,
             'type': 'button',
             'title': Messages.toolbar_show_text_tools
         })).append([
-            h('i.fa.fa-wrench', { 'aria-hidden': 'true' }),
+            h('i.fa.fa-pencil', { 'aria-hidden': 'true' }),
             h('span.cp-toolbar-label', {}, Messages.toolbar_text_tools)
         ]).click(function () {
             var isExpanded = $toolbar.is(':visible');