diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index 53bc9eaac..e5d677e57 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -461,8 +461,7 @@ class ChatView extends StatelessWidget {
                               AnimatedSize(
                                 duration: const Duration(milliseconds: 200),
                                 child: SizedBox(
-                                  height: controller.inputBarHeight +
-                                      bottomSheetPadding,
+                                  height: controller.inputBarHeight,
                                 ),
                               ),
                             if (controller.room.isActivityFinished)
@@ -487,18 +486,29 @@ class ChatView extends StatelessWidget {
                           Positioned(
                             left: 0,
                             right: 0,
-                            bottom: 16,
+                            bottom: 0,
                             child: Column(
                               mainAxisSize: MainAxisSize.min,
-                              crossAxisAlignment: CrossAxisAlignment.center,
+                              crossAxisAlignment: CrossAxisAlignment.stretch,
                               children: [
                                 ChatInputBarHeader(
                                   controller: controller,
                                   padding: bottomSheetPadding,
                                 ),
-                                ChatInputBar(
-                                  controller: controller,
-                                  padding: bottomSheetPadding,
+                                if (controller.showScrollDownButton)
+                                  Divider(
+                                    height: 1,
+                                    color: Theme.of(context).dividerColor,
+                                  ),
+                                Container(
+                                  decoration: BoxDecoration(
+                                    color:
+                                        Theme.of(context).colorScheme.surface,
+                                  ),
+                                  child: ChatInputBar(
+                                    controller: controller,
+                                    padding: bottomSheetPadding,
+                                  ),
                                 ),
                               ],
                             ),
diff --git a/lib/pangea/activity_sessions/activity_session_chat/activity_role_tooltip.dart b/lib/pangea/activity_sessions/activity_session_chat/activity_role_tooltip.dart
index 33a5844bf..e3663e150 100644
--- a/lib/pangea/activity_sessions/activity_session_chat/activity_role_tooltip.dart
+++ b/lib/pangea/activity_sessions/activity_session_chat/activity_role_tooltip.dart
@@ -46,23 +46,17 @@ class ActivityRoleTooltipState extends State<ActivityRoleTooltip> {
       return const SizedBox();
     }
 
-    return Container(
-      decoration: BoxDecoration(
-        border: Border(
-          top: BorderSide(
-            color: Theme.of(context).colorScheme.outline,
-            width: 0.1,
-          ),
-        ),
-      ),
-      child: InlineTooltip(
-        message: room.ownRole!.goal!,
-        isClosed: room.hasDismissedGoalTooltip,
-        onClose: () async {
-          await room.dismissGoalTooltip();
-          if (mounted) setState(() {});
-        },
-        padding: const EdgeInsets.all(16.0),
+    return InlineTooltip(
+      message: room.ownRole!.goal!,
+      isClosed: room.hasDismissedGoalTooltip,
+      onClose: () async {
+        await room.dismissGoalTooltip();
+        if (mounted) setState(() {});
+      },
+      padding: const EdgeInsets.only(
+        left: 16.0,
+        top: 16.0,
+        right: 16.0,
       ),
     );
   }
diff --git a/lib/pangea/chat/widgets/chat_input_bar.dart b/lib/pangea/chat/widgets/chat_input_bar.dart
index fbc0b0735..e001edd09 100644
--- a/lib/pangea/chat/widgets/chat_input_bar.dart
+++ b/lib/pangea/chat/widgets/chat_input_bar.dart
@@ -66,10 +66,8 @@ class ChatInputBarState extends State<ChatInputBar> {
               ),
             ),
             Container(
-              padding: EdgeInsets.only(
-                bottom: widget.padding,
-                left: widget.padding,
-                right: widget.padding,
+              padding: EdgeInsets.all(
+                widget.padding,
               ),
               constraints: const BoxConstraints(
                 maxWidth: FluffyThemes.maxTimelineWidth,