diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart
index 32cdca164..055f6b9f9 100644
--- a/lib/pages/chat/events/html_message.dart
+++ b/lib/pages/chat/events/html_message.dart
@@ -290,7 +290,6 @@ class HtmlMessage extends StatelessWidget {
         );
 
         return WidgetSpan(
-          alignment: PlaceholderAlignment.middle,
           child: CompositedTransformTarget(
             link: token != null && renderer.assignTokenKey
                 ? MatrixState.pAnyState
@@ -333,12 +332,12 @@ class HtmlMessage extends StatelessWidget {
                 MouseRegion(
                   cursor: SystemMouseCursors.click,
                   child: GestureDetector(
+                    behavior: HitTestBehavior.translucent,
                     onTap: onClick != null && token != null
                         ? () => onClick?.call(token)
                         : null,
-                    child: Text.rich(
-                      textScaler: TextScaler.noScaling,
-                      TextSpan(
+                    child: RichText(
+                      text: TextSpan(
                         children: [
                           LinkifySpan(
                             text: node.innerHtml,
diff --git a/lib/pangea/message_token_text/message_token_button.dart b/lib/pangea/message_token_text/message_token_button.dart
index a9c79c7b5..7e855e223 100644
--- a/lib/pangea/message_token_text/message_token_button.dart
+++ b/lib/pangea/message_token_text/message_token_button.dart
@@ -393,9 +393,7 @@ class MessageTokenButtonContent extends StatelessWidget {
             child: Container(
               height: height,
               padding: const EdgeInsets.only(top: 10.0),
-              width: MessageMode.wordMeaning == messageMode
-                  ? width
-                  : min(width, height),
+              width: max(width, 24.0),
               alignment: Alignment.center,
               decoration: BoxDecoration(
                 color: Theme.of(context)