diff --git a/res/drawable/message_bubble_incoming_no_arrow.xml b/res/drawable/message_bubble_incoming_no_arrow.xml
index d234508..050da48 100644
--- a/res/drawable/message_bubble_incoming_no_arrow.xml
+++ b/res/drawable/message_bubble_incoming_no_arrow.xml
@@ -16,5 +16,5 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/color_filter_base_color" />
-    <corners android:radius="3dp" />
+    <corners android:radius="28dp" />
 </shape>
diff --git a/res/drawable/message_bubble_outgoing_no_arrow.xml b/res/drawable/message_bubble_outgoing_no_arrow.xml
index d234508..050da48 100644
--- a/res/drawable/message_bubble_outgoing_no_arrow.xml
+++ b/res/drawable/message_bubble_outgoing_no_arrow.xml
@@ -16,5 +16,5 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/color_filter_base_color" />
-    <corners android:radius="3dp" />
+    <corners android:radius="28dp" />
 </shape>
diff --git a/res/drawable/msg_bubble_input_rounded.xml b/res/drawable/msg_bubble_input_rounded.xml
new file mode 100644
index 0000000..5ddabfb
--- /dev/null
+++ b/res/drawable/msg_bubble_input_rounded.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2023 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@android:color/white" />
+    <corners android:radius="28dp" />
+</shape>
diff --git a/res/layout/compose_message_view.xml b/res/layout/compose_message_view.xml
index 8bb8249..e6e94ca 100644
--- a/res/layout/compose_message_view.xml
+++ b/res/layout/compose_message_view.xml
@@ -17,6 +17,7 @@
 <com.android.messaging.ui.conversation.ComposeMessageView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/message_compose_view_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -110,6 +111,8 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_attachment_dark"
+                        android:minHeight="48dp"
+                        android:minWidth="48dp"
                         android:paddingTop="@dimen/compose_message_attachment_padding_topBottom"
                         android:paddingBottom="@dimen/compose_message_attachment_padding_topBottom"
                         android:contentDescription="@string/attachMediaButtonContentDescription" />
@@ -121,7 +124,7 @@
                         android:layout_width="0dp"
                         android:layout_weight="1"
                         android:layout_gravity="center"
-                        android:background="@drawable/msg_bubble_input"
+                        android:background="@drawable/msg_bubble_input_rounded"
                         android:hint="@string/compose_message_view_hint_text"
                         android:imeOptions="actionSend|flagNoEnterAction|flagNoExtractUi" />
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 734afe8..952a0d7 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -32,7 +32,7 @@
     <dimen name="conversation_list_image_preview_corner_radius">3dp</dimen>
     <dimen name="conversation_list_image_preview_size">56dp</dimen>
     <dimen name="conversation_list_contact_icon_size">56dp</dimen>
-    <dimen name="conversation_message_contact_icon_size">42dp</dimen>
+    <dimen name="conversation_message_contact_icon_size">48dp</dimen>
     <dimen name="conversation_message_photo_min_size">96dp</dimen>
     <dimen name="conversation_list_empty_text_bottom_margin">30dp</dimen>
     <dimen name="blocked_participant_list_item_view_padding">16dp</dimen>
@@ -53,7 +53,7 @@
     <dimen name="compose_message_chip_padding">3dp</dimen>
     <dimen name="compose_message_fields_horizontal_margin">16dp</dimen>
     <dimen name="compose_message_font_size">16sp</dimen>
-    <dimen name="compose_message_attachment_padding_sides">20dp</dimen>
+    <dimen name="compose_message_attachment_padding_sides">0dp</dimen>
     <dimen name="compose_message_attachment_padding_topBottom">10dp</dimen>
     <dimen name="compose_message_chips_view_max_height">133dp</dimen>
     <dimen name="compose_message_subject_left_padding">52dp</dimen>
@@ -64,7 +64,7 @@
     <dimen name="compose_message_subject_cancel_left_margin">12dp</dimen>
     <dimen name="compose_message_mms_indicator_padding_top">2dp</dimen>
     <dimen name="compose_message_send_button_padding_right">12dp</dimen>
-    <dimen name="compose_message_text_box_padding_side">8dp</dimen>
+    <dimen name="compose_message_text_box_padding_side">16dp</dimen>
 
     <!-- Notification related dimensions. -->
     <dimen name="notification_wearable_image_height">240dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8a6c691..4cb34c0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -143,6 +143,7 @@
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:paddingLeft">@dimen/compose_message_text_box_padding_side</item>
         <item name="android:paddingRight">@dimen/compose_message_text_box_padding_side</item>
+        <item name="android:layout_marginRight">8dp</item>
         <item name="android:minHeight">@dimen/conversation_message_contact_icon_size</item>
         <item name="android:maxLines">4</item>
         <item name="android:background">@null</item>
@@ -267,7 +268,7 @@
     <style name="ComposeMessageViewAttachMediaButtonStyle">
         <item name="android:paddingLeft">@dimen/compose_message_attachment_padding_sides</item>
         <item name="android:paddingRight">@dimen/compose_message_attachment_padding_sides</item>
-        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
     </style>
 
     <style name="ContactListItemViewStyle">
diff --git a/src/com/android/messaging/ui/conversation/ConversationMessageView.java b/src/com/android/messaging/ui/conversation/ConversationMessageView.java
index 935a23c..e2af75b 100644
--- a/src/com/android/messaging/ui/conversation/ConversationMessageView.java
+++ b/src/com/android/messaging/ui/conversation/ConversationMessageView.java
@@ -287,8 +287,7 @@ public class ConversationMessageView extends FrameLayout implements View.OnClick
      * contains media attachments or if shouldShowSimplifiedVisualStyle() is true.
      */
     private boolean shouldShowMessageBubbleArrow() {
-        return !shouldShowSimplifiedVisualStyle()
-                && !(mData.hasAttachments() || mMessageHasYouTubeLink);
+        return false;
     }
 
     /**