diff --git a/lib/pangea/chat/widgets/chat_input_bar.dart b/lib/pangea/chat/widgets/chat_input_bar.dart
index 78a0cdf4f..599c25abb 100644
--- a/lib/pangea/chat/widgets/chat_input_bar.dart
+++ b/lib/pangea/chat/widgets/chat_input_bar.dart
@@ -31,18 +31,30 @@ class ChatInputBar extends StatelessWidget {
           valueListenable: controller.choreographer.itController.open,
           builder: (context, open, __) {
             return open
-                ? InstructionsInlineTooltip(
-                    instructionsEnum: InstructionsEnum.clickBestOption,
-                    animate: false,
-                    padding: EdgeInsets.only(
-                      left: 16.0,
-                      right: 16.0,
-                      top: FluffyThemes.isColumnMode(context) ? 16.0 : 8.0,
+                ? Container(
+                    constraints: const BoxConstraints(
+                      maxWidth: FluffyThemes.maxTimelineWidth,
+                    ),
+                    alignment: Alignment.center,
+                    child: InstructionsInlineTooltip(
+                      instructionsEnum: InstructionsEnum.clickBestOption,
+                      animate: false,
+                      padding: EdgeInsets.only(
+                        left: 16.0,
+                        right: 16.0,
+                        top: FluffyThemes.isColumnMode(context) ? 16.0 : 8.0,
+                      ),
                     ),
                   )
-                : ActivityRoleTooltip(
-                    room: controller.room,
-                    hide: controller.choreographer.itController.open,
+                : Container(
+                    constraints: const BoxConstraints(
+                      maxWidth: FluffyThemes.maxTimelineWidth,
+                    ),
+                    alignment: Alignment.center,
+                    child: ActivityRoleTooltip(
+                      room: controller.room,
+                      hide: controller.choreographer.itController.open,
+                    ),
                   );
           },
         ),
diff --git a/lib/pangea/instructions/instructions_inline_tooltip.dart b/lib/pangea/instructions/instructions_inline_tooltip.dart
index 6059cb90a..5839d5657 100644
--- a/lib/pangea/instructions/instructions_inline_tooltip.dart
+++ b/lib/pangea/instructions/instructions_inline_tooltip.dart
@@ -134,25 +134,28 @@ class InlineTooltipState extends State<InlineTooltip>
             crossAxisAlignment: CrossAxisAlignment.center,
             mainAxisSize: MainAxisSize.min,
             children: [
-              Icon(
-                Icons.lightbulb,
-                size: 20,
-                color: Theme.of(context).colorScheme.onSurface,
+              Padding(
+                padding: const EdgeInsets.only(right: 6.0),
+                child: Icon(
+                  Icons.lightbulb,
+                  size: 20,
+                  color: Theme.of(context).colorScheme.onSurface,
+                ),
               ),
-              const SizedBox(width: 8),
               Flexible(
                 child: Center(
                   child: Text(
                     widget.message,
                     style: widget.textStyle ??
                         (FluffyThemes.isColumnMode(context)
-                            ? Theme.of(context).textTheme.titleLarge
-                            : Theme.of(context).textTheme.bodyLarge),
+                            ? Theme.of(context).textTheme.titleSmall
+                            : Theme.of(context).textTheme.bodyMedium),
                     textAlign: TextAlign.center,
                   ),
                 ),
               ),
               IconButton(
+                padding: const EdgeInsets.only(left: 6.0),
                 constraints: const BoxConstraints(),
                 icon: Icon(
                   Icons.close_outlined,