diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index aed1603c..04c2273f 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -83,7 +83,10 @@ class ChatView extends StatelessWidget {
                   child: Row(
                     mainAxisSize: MainAxisSize.min,
                     children: [
-                      const Icon(Icons.report_outlined),
+                      const Icon(
+                        Icons.shield_outlined,
+                        color: Colors.red,
+                      ),
                       const SizedBox(width: 12),
                       Text(L10n.of(context).reportMessage),
                     ],
diff --git a/lib/pages/chat/event_info_dialog.dart b/lib/pages/chat/event_info_dialog.dart
index 15f765d5..679c34d4 100644
--- a/lib/pages/chat/event_info_dialog.dart
+++ b/lib/pages/chat/event_info_dialog.dart
@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';
 
+import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/utils/date_time_extension.dart';
 import 'package:fluffychat/widgets/avatar.dart';
 
@@ -27,7 +28,7 @@ class EventInfoDialog extends StatelessWidget {
 
   String get prettyJson {
     const JsonDecoder decoder = JsonDecoder();
-    const JsonEncoder encoder = JsonEncoder.withIndent('  ');
+    const JsonEncoder encoder = JsonEncoder.withIndent('    ');
     final object = decoder.convert(jsonEncode(event.toJson()));
     return encoder.convert(object);
   }
@@ -52,7 +53,7 @@ class EventInfoDialog extends StatelessWidget {
             ),
             title: Text(L10n.of(context).sender),
             subtitle:
-                Text('${event.sender.calcDisplayname()} <${event.senderId}>'),
+                Text('${event.sender.calcDisplayname()} [${event.senderId}]'),
           ),
           ListTile(
             title: Text(L10n.of(context).time),
@@ -62,14 +63,17 @@ class EventInfoDialog extends StatelessWidget {
             title: Text(L10n.of(context).messageType),
             subtitle: Text(event.humanreadableType),
           ),
-          ListTile(
-            title: Text(L10n.of(context).sourceCode),
-          ),
+          ListTile(title: Text('${L10n.of(context).sourceCode}:')),
           Padding(
             padding: const EdgeInsets.all(12.0),
-            child: SingleChildScrollView(
-              scrollDirection: Axis.horizontal,
-              child: Text(prettyJson),
+            child: Material(
+              borderRadius: BorderRadius.circular(AppConfig.borderRadius),
+              color: Theme.of(context).colorScheme.surface,
+              child: SingleChildScrollView(
+                padding: const EdgeInsets.all(8),
+                scrollDirection: Axis.horizontal,
+                child: SelectableText(prettyJson),
+              ),
             ),
           ),
         ],