diff --git a/lib/view/pages/talk/chatView.dart b/lib/view/pages/talk/chatView.dart
index 34577bb..4d6ca48 100644
--- a/lib/view/pages/talk/chatView.dart
+++ b/lib/view/pages/talk/chatView.dart
@@ -51,6 +51,7 @@ class _ChatViewState extends State<ChatView> {
             var elementDate = DateTime.fromMillisecondsSinceEpoch(element.timestamp * 1000);
 
             if(element.systemMessage.contains('reaction')) return;
+            if(element.systemMessage.contains('poll_voted')) return;
             var commonRead = int.parse(data.getChatResponse.headers?['x-chat-last-common-read'] ?? '0');
 
             if(!elementDate.isSameDay(lastDate)) {
@@ -128,7 +129,7 @@ class _ChatViewState extends State<ChatView> {
                   ),
                 ),
                 Container(
-                  color: Theme.of(context).colorScheme.background,
+                  color: Theme.of(context).colorScheme.surface,
                   child: TalkNavigator.isSecondaryVisible(context)
                       ? ChatTextfield(widget.room.token, selfId: widget.selfId)
                       : SafeArea(child: ChatTextfield(widget.room.token, selfId: widget.selfId)
diff --git a/lib/view/pages/talk/components/chatBubble.dart b/lib/view/pages/talk/components/chatBubble.dart
index 5ce3b97..a6a1f2b 100644
--- a/lib/view/pages/talk/components/chatBubble.dart
+++ b/lib/view/pages/talk/components/chatBubble.dart
@@ -306,20 +306,20 @@ class _ChatBubbleState extends State<ChatBubble> with SingleTickerProviderStateM
               showDialog(context: context, builder: (context) => AlertDialog(
                 title: Text(message.originalData!['object']!.name, textScaler: TextScaler.linear(0.9)),
                 content: FutureBuilder(
-                    future: pollState,
-                    builder: (context, snapshot) {
-                      if(snapshot.connectionState == ConnectionState.waiting) return const Column(mainAxisSize: MainAxisSize.min, children: [LoadingSpinner()]);
+                  future: pollState,
+                  builder: (context, snapshot) {
+                    if(snapshot.connectionState == ConnectionState.waiting) return const Column(mainAxisSize: MainAxisSize.min, children: [LoadingSpinner()]);
 
-                      var pollData = snapshot.data!.data;
-                      return ListView(
-                        shrinkWrap: true,
-                        children: [
-                          PollOptionsList(
-                            pollData: pollData
-                          )
-                        ]
-                      );
-                    }
+                    var pollData = snapshot.data!.data;
+                    return ListView(
+                      shrinkWrap: true,
+                      children: [
+                        PollOptionsList(
+                          pollData: pollData
+                        )
+                      ]
+                    );
+                  }
                 ),
                 actions: [
                   TextButton(