diff --git a/lib/pages/chat/chat_input_row.dart b/lib/pages/chat/chat_input_row.dart
index 9d048d274..c3cb6ea09 100644
--- a/lib/pages/chat/chat_input_row.dart
+++ b/lib/pages/chat/chat_input_row.dart
@@ -266,6 +266,7 @@ class ChatInputRow extends StatelessWidget {
               ),
               Container(
                 height: height,
+                width: height,
                 alignment: Alignment.center,
                 child: AnimatedCrossFade(
                   crossFadeState: PlatformInfos.platformCanRecord &&
@@ -274,19 +275,32 @@ class ChatInputRow extends StatelessWidget {
                       : CrossFadeState.showSecond,
                   duration: FluffyThemes.animationDuration,
                   sizeCurve: FluffyThemes.animationCurve,
-                  firstChild: IconButton(
+                  firstChild: FloatingActionButton.small(
                     tooltip: L10n.of(context)!.voiceMessage,
                     onPressed: controller.voiceMessageAction,
-                    icon: const Icon(Icons.mic_none_outlined),
+                    elevation: 0,
+                    heroTag: null,
+                    shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(height),
+                    ),
+                    backgroundColor: Theme.of(context).colorScheme.primary,
+                    foregroundColor: Theme.of(context).colorScheme.onPrimary,
+                    child: const Icon(Icons.mic_none_outlined),
                   ),
-                  secondChild: IconButton(
+                  secondChild: FloatingActionButton.small(
                     tooltip: L10n.of(context)!.voiceMessage,
                     onPressed: controller.send,
-                    icon: const Icon(Icons.send_outlined),
+                    elevation: 0,
+                    heroTag: null,
+                    shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(height),
+                    ),
+                    backgroundColor: Theme.of(context).colorScheme.secondary,
+                    foregroundColor: Theme.of(context).colorScheme.onSecondary,
+                    child: const Icon(Icons.send_outlined),
                   ),
                 ),
               ),
-              const SizedBox(width: 4),
             ],
     );
   }
diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index 3ec637b83..12c8e5b8e 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -285,15 +285,9 @@ class ChatView extends StatelessWidget {
                                 clipBehavior: Clip.hardEdge,
                                 color: Theme.of(context)
                                     .colorScheme
-                                    .onInverseSurface
-                                    .withOpacity(0.9),
-                                shape: RoundedRectangleBorder(
-                                  borderRadius: const BorderRadius.all(
-                                    Radius.circular(24),
-                                  ),
-                                  side: BorderSide(
-                                    color: Theme.of(context).dividerColor,
-                                  ),
+                                    .surfaceVariant,
+                                borderRadius: const BorderRadius.all(
+                                  Radius.circular(24),
                                 ),
                                 child: controller.room.isAbandonedDMRoom == true
                                     ? Row(
diff --git a/lib/pages/chat/events/state_message.dart b/lib/pages/chat/events/state_message.dart
index b5e54eba3..5b76993e6 100644
--- a/lib/pages/chat/events/state_message.dart
+++ b/lib/pages/chat/events/state_message.dart
@@ -13,15 +13,12 @@ class StateMessage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Padding(
-      padding: const EdgeInsets.symmetric(
-        horizontal: 8.0,
-        vertical: 4.0,
-      ),
+      padding: const EdgeInsets.symmetric(horizontal: 8.0),
       child: Center(
         child: Container(
           padding: const EdgeInsets.all(8),
           decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.onInverseSurface,
+            color: Theme.of(context).colorScheme.background,
             borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
           ),
           child: FutureBuilder<String>(
@@ -34,7 +31,7 @@ class StateMessage extends StatelessWidget {
                     ),
                 textAlign: TextAlign.center,
                 style: TextStyle(
-                  fontSize: 14 * AppConfig.fontSizeFactor,
+                  fontSize: 13 * AppConfig.fontSizeFactor,
                   color: Theme.of(context).colorScheme.onSecondaryContainer,
                   decoration:
                       event.redacted ? TextDecoration.lineThrough : null,