diff --git a/lib/config/app_config.dart b/lib/config/app_config.dart
index 548e0a90a..ef4487e9a 100644
--- a/lib/config/app_config.dart
+++ b/lib/config/app_config.dart
@@ -23,8 +23,8 @@ abstract class AppConfig {
   static const bool allowOtherHomeservers = true;
   static const bool enableRegistration = true;
   static const double toolbarMaxHeight = 300.0;
-  static const double toolbarMinHeight = 70.0;
-  static const double toolbarMinWidth = 270.0;
+  static const double toolbarMinHeight = 175.0;
+  static const double toolbarMinWidth = 350.0;
   static const double toolbarButtonsHeight = 50.0;
   // #Pangea
   // static const Color primaryColor = Color(0xFF5625BA);
diff --git a/lib/pangea/widgets/chat/message_toolbar.dart b/lib/pangea/widgets/chat/message_toolbar.dart
index ffca4f32c..92d4b578c 100644
--- a/lib/pangea/widgets/chat/message_toolbar.dart
+++ b/lib/pangea/widgets/chat/message_toolbar.dart
@@ -138,10 +138,17 @@ class MessageToolbar extends StatelessWidget {
         minHeight: AppConfig.toolbarMinHeight,
         // maxWidth is set by MessageSelectionOverlay
       ),
-      child: SingleChildScrollView(
-        child: AnimatedSize(
-          duration: FluffyThemes.animationDuration,
-          child: toolbarContent(context),
+      child: Container(
+        decoration: BoxDecoration(border: Border.all(color: Colors.green)),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            AnimatedSize(
+              duration: FluffyThemes.animationDuration,
+              child: toolbarContent(context),
+            ),
+          ],
         ),
       ),
     );
diff --git a/lib/pangea/widgets/chat/message_translation_card.dart b/lib/pangea/widgets/chat/message_translation_card.dart
index 3c0d750a3..0f95a3e55 100644
--- a/lib/pangea/widgets/chat/message_translation_card.dart
+++ b/lib/pangea/widgets/chat/message_translation_card.dart
@@ -147,35 +147,25 @@ class MessageTranslationCardState extends State<MessageTranslationCard> {
 
     return Padding(
       padding: const EdgeInsets.fromLTRB(16, 20, 16, 16),
-      child: Row(
-        mainAxisSize: MainAxisSize.min,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.center,
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
-          Flexible(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.center,
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Text(
-                  widget.selection != null
-                      ? selectionTranslation!
-                      : repEvent!.text,
-                  style: BotStyle.text(context),
-                  textAlign: TextAlign.center,
-                ),
-                if (notGoingToTranslate && widget.selection == null)
-                  InlineTooltip(
-                    instructionsEnum: InstructionsEnum.l1Translation,
-                    onClose: () => setState(() {}),
-                  ),
-                if (widget.selection != null)
-                  InlineTooltip(
-                    instructionsEnum: InstructionsEnum.clickAgainToDeselect,
-                    onClose: () => setState(() {}),
-                  ),
-              ],
-            ),
+          Text(
+            widget.selection != null ? selectionTranslation! : repEvent!.text,
+            style: BotStyle.text(context),
+            textAlign: TextAlign.center,
           ),
+          if (notGoingToTranslate && widget.selection == null)
+            InlineTooltip(
+              instructionsEnum: InstructionsEnum.l1Translation,
+              onClose: () => setState(() {}),
+            ),
+          if (widget.selection != null)
+            InlineTooltip(
+              instructionsEnum: InstructionsEnum.clickAgainToDeselect,
+              onClose: () => setState(() {}),
+            ),
         ],
       ),
     );