diff --git a/lib/pangea/lemmas/construct_xp_widget.dart b/lib/pangea/lemmas/construct_xp_widget.dart
index 105a3a4bf..34a73a92c 100644
--- a/lib/pangea/lemmas/construct_xp_widget.dart
+++ b/lib/pangea/lemmas/construct_xp_widget.dart
@@ -102,10 +102,6 @@ class ConstructXpWidgetState extends State<ConstructXpWidget>
 
   @override
   Widget build(BuildContext context) {
-    if (constructLemmaCategory == null) {
-      return const SizedBox();
-    }
-
     return SizedBox(
       width: widget.size,
       height: widget.size,
diff --git a/lib/pangea/toolbar/widgets/word_zoom/lemma_widget.dart b/lib/pangea/toolbar/widgets/word_zoom/lemma_widget.dart
index 05a4a20f5..8882e80e7 100644
--- a/lib/pangea/toolbar/widgets/word_zoom/lemma_widget.dart
+++ b/lib/pangea/toolbar/widgets/word_zoom/lemma_widget.dart
@@ -9,7 +9,6 @@ import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
 import 'package:fluffychat/pangea/events/models/tokens_event_content_model.dart';
 import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/toolbar/controllers/tts_controller.dart';
-import 'package:fluffychat/pangea/toolbar/enums/message_mode_enum.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart';
 import 'package:fluffychat/pangea/toolbar/widgets/practice_activity/word_audio_button.dart';
 import 'package:fluffychat/widgets/future_loading_dialog.dart';
@@ -170,39 +169,17 @@ class LemmaWidgetState extends State<LemmaWidget> {
 
     return Row(
       children: [
-        // Tooltip(
-        //   triggerMode: TooltipTriggerMode.tap,
-        //   message: L10n.of(context).doubleClickToEdit,
-        //   child: GestureDetector(
-        //     onLongPress: () => _toggleEditMode(true),
-        //     onDoubleTap: () => _toggleEditMode(true),
-        //     child:
         Text(
           widget.token.lemma.text,
           style: Theme.of(context).textTheme.headlineSmall,
           overflow: TextOverflow.ellipsis,
         ),
-        //   ),
-        // ),
-        if (widget.token.lemma.text.toLowerCase() ==
-            widget.token.text.content.toLowerCase())
-          WordAudioButton(
-            text: widget.token.text.content,
-            isSelected:
-                MessageMode.listening == widget.overlayController?.toolbarMode,
-            baseOpacity: 0.4,
-            callbackOverride: widget.overlayController?.practiceSelection
-                        ?.hasActiveActivityByToken(
-                      MessageMode.listening.associatedActivityType!,
-                      widget.token,
-                    ) ==
-                    true
-                ? () => widget.overlayController
-                    ?.updateToolbarMode(MessageMode.listening)
-                : null,
-            uniqueID: "lemma-content-${widget.token.text.content}",
-            langCode: widget.pangeaMessageEvent.messageDisplayLangCode,
-          ),
+        WordAudioButton(
+          text: widget.token.lemma.text,
+          baseOpacity: 0.4,
+          uniqueID: "lemma-content-${widget.token.text.content}",
+          langCode: widget.pangeaMessageEvent.messageDisplayLangCode,
+        ),
       ],
     );
   }
diff --git a/lib/pangea/toolbar/widgets/word_zoom/word_zoom_widget.dart b/lib/pangea/toolbar/widgets/word_zoom/word_zoom_widget.dart
index 158598125..27cbcd1f8 100644
--- a/lib/pangea/toolbar/widgets/word_zoom/word_zoom_widget.dart
+++ b/lib/pangea/toolbar/widgets/word_zoom/word_zoom_widget.dart
@@ -69,11 +69,14 @@ class WordZoomWidget extends StatelessWidget {
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
                   //@ggurdin - might need to play with size to properly center
-                  IconButton(
-                    onPressed: () => overlayController.updateSelectedSpan(
-                      token.text,
+                  SizedBox(
+                    width: 24.0,
+                    child: IconButton(
+                      onPressed: () => overlayController.updateSelectedSpan(
+                        token.text,
+                      ),
+                      icon: const Icon(Icons.close),
                     ),
-                    icon: const Icon(Icons.close),
                   ),
                   LemmaWidget(
                     token: _selectedToken,
@@ -162,7 +165,7 @@ class WordZoomWidget extends StatelessWidget {
               alignment: WrapAlignment.center,
               crossAxisAlignment: WrapCrossAlignment.center,
               children: [
-                if (!_selectedToken.doesLemmaTextMatchTokenText) ...[
+                ...[
                   Text(
                     _selectedToken.text.content,
                     style: Theme.of(context).textTheme.bodyLarge,
@@ -170,20 +173,7 @@ class WordZoomWidget extends StatelessWidget {
                   ),
                   WordAudioButton(
                     text: _selectedToken.text.content,
-                    isSelected:
-                        MessageMode.listening == overlayController.toolbarMode,
                     baseOpacity: 0.4,
-                    callbackOverride: overlayController.hideWordCardContent &&
-                            overlayController.practiceSelection
-                                    ?.hasActiveActivityByToken(
-                                  MessageMode.listening.associatedActivityType!,
-                                  _selectedToken,
-                                ) ==
-                                true &&
-                            overlayController.hideWordCardContent
-                        ? () => overlayController
-                            .updateToolbarMode(MessageMode.listening)
-                        : null,
                     uniqueID: "word-zoom-audio-${_selectedToken.text.content}",
                     langCode: overlayController
                         .pangeaMessageEvent?.messageDisplayLangCode,