diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs
index dbb36128..91a16fb4 100644
--- a/android/.settings/org.eclipse.buildship.core.prefs
+++ b/android/.settings/org.eclipse.buildship.core.prefs
@@ -5,7 +5,7 @@ connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=/Users/kounex/.vscode/extensions/redhat.java-1.24.0-darwin-arm64/jre/17.0.8.1-macosx-aarch64
+java.home=/opt/homebrew/Cellar/openjdk/21.0.1/libexec/openjdk.jdk/Contents/Home
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true
diff --git a/lib/shared/general/base/adaptive_text_field.dart b/lib/shared/general/base/adaptive_text_field.dart
index 78083773..4028b7ae 100644
--- a/lib/shared/general/base/adaptive_text_field.dart
+++ b/lib/shared/general/base/adaptive_text_field.dart
@@ -15,8 +15,8 @@ class CustomValidationTextEditingController extends TextEditingController {
 
   CustomValidationTextEditingController({
     this.check,
-    String? text,
-  }) : super(text: text);
+    super.text,
+  });
 
   bool get isValid {
     this.submit();
@@ -62,6 +62,7 @@ class BaseAdaptiveTextField extends StatefulWidget {
   final void Function(String text)? onChanged;
 
   const BaseAdaptiveTextField({
+    super.key,
     Key? key,
     required this.controller,
     this.placeholder,
@@ -160,6 +161,7 @@ class BaseAdaptiveTextFieldState extends State<BaseAdaptiveTextField> {
   @override
   Widget build(BuildContext context) {
     return Column(
+      mainAxisSize: MainAxisSize.min,
       children: [
         switch (this.widget.platform ?? Theme.of(context).platform) {
           TargetPlatform.iOS || TargetPlatform.macOS => CupertinoTextField(
diff --git a/lib/views/dashboard/widgets/dashboard_content/dashboard_content_streaming.dart b/lib/views/dashboard/widgets/dashboard_content/dashboard_content_streaming.dart
index 6d04fd28..9bd67d1e 100644
--- a/lib/views/dashboard/widgets/dashboard_content/dashboard_content_streaming.dart
+++ b/lib/views/dashboard/widgets/dashboard_content/dashboard_content_streaming.dart
@@ -17,12 +17,10 @@ class DashboardContentStreaming extends StatelessWidget {
           const ResizeableScenePreview(
             resizeable: false,
           ),
-          const SizedBox(height: 12.0),
           const SceneButtons(
             size: 64,
             mode: SceneButtonsMode.horizontalScroll,
           ),
-          const SizedBox(height: 12.0),
           const Flexible(
             child: StreamChat(
               usernameRowExpandable: true,
diff --git a/lib/views/dashboard/widgets/scenes/scene_buttons/scene_buttons.dart b/lib/views/dashboard/widgets/scenes/scene_buttons/scene_buttons.dart
index a779baa1..d9e5f56a 100644
--- a/lib/views/dashboard/widgets/scenes/scene_buttons/scene_buttons.dart
+++ b/lib/views/dashboard/widgets/scenes/scene_buttons/scene_buttons.dart
@@ -129,18 +129,22 @@ class SceneButtons extends StatelessWidget {
                 children: sceneButtons,
               ),
             SceneButtonsMode.horizontalScroll => SizedBox(
-                height: this.size,
-                child: Scrollbar(
-                  scrollbarOrientation: ScrollbarOrientation.bottom,
-                  thumbVisibility: true,
-                  trackVisibility: true,
-                  child: ListView.separated(
-                    scrollDirection: Axis.horizontal,
-                    padding: const EdgeInsets.only(left: 12.0),
-                    itemCount: sceneButtons.length,
-                    itemBuilder: (context, index) => sceneButtons[index],
-                    separatorBuilder: (context, index) =>
-                        const SizedBox(width: 12.0),
+                height: this.size + 24.0,
+                child: MediaQuery.removePadding(
+                  removeBottom: true,
+                  context: context,
+                  child: Scrollbar(
+                    scrollbarOrientation: ScrollbarOrientation.bottom,
+                    thumbVisibility: true,
+                    trackVisibility: true,
+                    child: ListView.separated(
+                      scrollDirection: Axis.horizontal,
+                      padding: const EdgeInsets.all(12.0),
+                      itemCount: sceneButtons.length,
+                      itemBuilder: (context, index) => sceneButtons[index],
+                      separatorBuilder: (context, index) =>
+                          const SizedBox(width: 12.0),
+                    ),
                   ),
                 ),
               ),