diff --git a/flutter/lib/common/widgets/chat_page.dart b/flutter/lib/common/widgets/chat_page.dart
index 6106bade5..affe94091 100644
--- a/flutter/lib/common/widgets/chat_page.dart
+++ b/flutter/lib/common/widgets/chat_page.dart
@@ -47,7 +47,6 @@ class ChatPage extends StatelessWidget implements PageShape {
       value: chatModel,
       child: Container(
         color: Theme.of(context).scaffoldBackgroundColor,
-        padding: EdgeInsets.all(14.0),
         child: Consumer<ChatModel>(
           builder: (context, chatModel, child) {
             final currentUser = chatModel.currentUser;
@@ -76,27 +75,20 @@ class ChatPage extends StatelessWidget implements PageShape {
                             fontSize: 14,
                             color:
                                 Theme.of(context).textTheme.titleLarge?.color),
-                        inputDecoration: isDesktop
-                            ? InputDecoration(
-                                isDense: true,
-                                hintText: translate('Write a message'),
-                                filled: true,
-                                fillColor:
-                                    Theme.of(context).colorScheme.background,
-                                contentPadding: EdgeInsets.all(10),
-                                border: OutlineInputBorder(
-                                  borderRadius: BorderRadius.circular(10.0),
-                                  borderSide: const BorderSide(
-                                    width: 1,
-                                    style: BorderStyle.solid,
-                                  ),
-                                ),
-                              )
-                            : defaultInputDecoration(
-                                hintText: translate('Write a message'),
-                                fillColor:
-                                    Theme.of(context).colorScheme.background,
-                              ),
+                        inputDecoration: InputDecoration(
+                          isDense: true,
+                          hintText: translate('Write a message'),
+                          filled: true,
+                          fillColor: Theme.of(context).colorScheme.background,
+                          contentPadding: EdgeInsets.all(10),
+                          border: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(10.0),
+                            borderSide: const BorderSide(
+                              width: 1,
+                              style: BorderStyle.solid,
+                            ),
+                          ),
+                        ),
                         sendButtonBuilder: defaultSendButton(
                           padding:
                               EdgeInsets.symmetric(horizontal: 6, vertical: 0),
diff --git a/flutter/lib/common/widgets/overlay.dart b/flutter/lib/common/widgets/overlay.dart
index 8c44e7ee4..73210b5fe 100644
--- a/flutter/lib/common/widgets/overlay.dart
+++ b/flutter/lib/common/widgets/overlay.dart
@@ -71,13 +71,19 @@ class DraggableChatWindow extends StatelessWidget {
                   onPressed: () {
                     chatModel.hideChatWindowOverlay();
                   },
-                  icon: const Icon(Icons.keyboard_arrow_down)),
+                  icon: const Icon(
+                    Icons.keyboard_arrow_down,
+                    color: Colors.white,
+                  )),
               IconButton(
                   onPressed: () {
                     chatModel.hideChatWindowOverlay();
                     chatModel.hideChatIconOverlay();
                   },
-                  icon: const Icon(Icons.close))
+                  icon: const Icon(
+                    Icons.close,
+                    color: Colors.white,
+                  ))
             ],
           )
         ],