diff --git a/lib/features/chat/presentation/pages/chat_screen.dart b/lib/features/chat/presentation/pages/chat_screen.dart
index 25a8fd14..d724c3bd 100644
--- a/lib/features/chat/presentation/pages/chat_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_screen.dart
@@ -175,14 +175,17 @@ class _ChatScreenState extends State<ChatScreen> {
                         // User canceled the picker
                       }
                     },
-                    borderRadius: BorderRadius.circular(16),
+                    customBorder: CircleBorder(),
                     child: Ink(
                       height: 32,
                       width: 32,
-                      child: Icon(
-                        Icons.attach_file_rounded,
-                        size: 28,
-                        color: Color(0xFF858E99),
+                      child: Transform.rotate(
+                        angle: 3.8,
+                        child: Icon(
+                          Icons.attach_file_rounded,
+                          size: 24,
+                          color: Color(0xFF858E99),
+                        ),
                       ),
                     ),
                   ),
@@ -232,7 +235,7 @@ class _ChatScreenState extends State<ChatScreen> {
                   ),
                   SizedBox(width: 8),
                   InkWell(
-                    borderRadius: BorderRadius.circular(16),
+                    customBorder: CircleBorder(),
                     onTap: () {
                       if (textEditingController.text.isNotEmpty) {
                         context.read<ChatRoomCubit>().sendMessage(
@@ -245,12 +248,16 @@ class _ChatScreenState extends State<ChatScreen> {
                       }
                     },
                     child: Ink(
+                      decoration: BoxDecoration(
+                        color: appTheme.blueA400,
+                        shape: BoxShape.circle,
+                      ),
                       height: 32,
                       width: 32,
                       child: Icon(
-                        Icons.send_outlined,
-                        size: 28,
-                        color: Color(0xFF858E99),
+                        Icons.arrow_upward_rounded,
+                        size: 20,
+                        color: Colors.white,
                       ),
                     ),
                   ),