diff --git a/res/layout/attachment_pending_item.xml b/res/layout/attachment_pending_item.xml
index 3e9bec7..8a67fd5 100644
--- a/res/layout/attachment_pending_item.xml
+++ b/res/layout/attachment_pending_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The Android Open Source Project
+    Copyright (C) 2024 The LineageOS Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,7 +22,6 @@
         android:orientation="vertical">
 
     <ImageView
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/pending_item_view"
         android:layout_width="@dimen/pending_attachment_size"
         android:layout_height="@dimen/pending_attachment_size"
diff --git a/res/layout/compose_message_view.xml b/res/layout/compose_message_view.xml
index e6e94ca..bf93e10 100644
--- a/res/layout/compose_message_view.xml
+++ b/res/layout/compose_message_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The Android Open Source Project
+    Copyright (C) 2024 The LineageOS Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -87,7 +88,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:baselineAligned="false">
 
             <!-- Contains compose message bubble and character counter for SMS or attachments size
                  for MMS which should be left aligned -->
diff --git a/res/layout/contact_list_item_view.xml b/res/layout/contact_list_item_view.xml
index 71a7370..24ca07c 100644
--- a/res/layout/contact_list_item_view.xml
+++ b/res/layout/contact_list_item_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The Android Open Source Project
+    Copyright (C) 2024 The LineageOS Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -70,7 +71,7 @@
         android:layout_height="wrap_content">
             <TextView
                 android:id="@+id/contact_name"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:paddingBottom="4dp"
diff --git a/res/layout/conversation_fragment.xml b/res/layout/conversation_fragment.xml
index 0bf42f5..75b9763 100644
--- a/res/layout/conversation_fragment.xml
+++ b/res/layout/conversation_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The Android Open Source Project
+    Copyright (C) 2024 The LineageOS Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -24,14 +25,13 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="1"
         android:orientation="vertical">
         <!-- This FrameLayout will take all available height (excluding media picker)
         but setting height to 0dp causes it not to shrink properly in KK, so a height of match_parent
         works equally well -->
         <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="0dp"
             android:layout_weight="1" >
             <!-- Message list -->
             <androidx.recyclerview.widget.RecyclerView
diff --git a/res/layout/conversation_list_item_view.xml b/res/layout/conversation_list_item_view.xml
index c89e470..aa3e4e8 100644
--- a/res/layout/conversation_list_item_view.xml
+++ b/res/layout/conversation_list_item_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The Android Open Source Project
+    Copyright (C) 2024 The LineageOS Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -66,7 +67,8 @@
             android:background="?android:attr/selectableItemBackground"
             android:clipToPadding="false"
             android:duplicateParentState="true"
-            android:padding="@dimen/conversation_list_item_view_padding">
+            android:padding="@dimen/conversation_list_item_view_padding"
+            android:baselineAligned="false">
 
             <!-- Contact avatar on the left side of the view -->
             <FrameLayout
diff --git a/res/layout/mediapicker_contact_chooser.xml b/res/layout/mediapicker_contact_chooser.xml
index 67091f2..3a55cba 100644
--- a/res/layout/mediapicker_contact_chooser.xml
+++ b/res/layout/mediapicker_contact_chooser.xml
@@ -45,7 +45,7 @@
             android:src="@drawable/ic_person_light"
             android:scaleX="1.33"
             android:scaleY="1.33"
-            android:tint="@color/primary_color"
+            app:tint="@color/primary_color"
             android:importantForAccessibility="no"
             android:contentDescription="@null" />
     </FrameLayout>
diff --git a/res/layout/widget_conversation.xml b/res/layout/widget_conversation.xml
index 9037a6f..304bfb3 100644
--- a/res/layout/widget_conversation.xml
+++ b/res/layout/widget_conversation.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The Android Open Source Project
+    Copyright (C) 2024 The LineageOS Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -65,7 +66,6 @@
         android:layout_marginTop="-2dp"
         android:layout_width="match_parent"
         android:layout_height="0dip"
-        android:layout_weight="1"
         android:drawSelectorOnTop="true"
         android:transcriptMode="alwaysScroll"
         android:stackFromBottom="true"
@@ -78,7 +78,6 @@
         android:layout_above="@+id/bottom_line"
         android:layout_width="match_parent"
         android:layout_height="0dip"
-        android:layout_weight="1"
         android:orientation="horizontal"
         android:gravity="center_vertical"
         android:visibility="gone"
diff --git a/res/layout/widget_conversation_list_item.xml b/res/layout/widget_conversation_list_item.xml
index c1a140a..bd49026 100644
--- a/res/layout/widget_conversation_list_item.xml
+++ b/res/layout/widget_conversation_list_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The Android Open Source Project
+    Copyright (C) 2024 The LineageOS Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -33,7 +34,7 @@
             style="@style/WidgetConversationListItemAvatar"
             android:layout_width="@dimen/contact_icon_view_normal_size"
             android:layout_height="@dimen/contact_icon_view_normal_size"
-            android:layout_centerVertical="true"
+            android:layout_gravity="center_vertical"
             android:scaleType="fitXY"
             android:importantForAccessibility="no"
             android:contentDescription="@null" />
diff --git a/res/layout/widget_message_item_incoming.xml b/res/layout/widget_message_item_incoming.xml
index f9d3117..00c8bd4 100644
--- a/res/layout/widget_message_item_incoming.xml
+++ b/res/layout/widget_message_item_incoming.xml
@@ -35,7 +35,7 @@
             style="@style/WidgetConversationItemIncomingAvatarShadow"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
+            android:layout_gravity="center_vertical"
             android:src="@drawable/ic_widget_avatar_shadow"
             android:layout_marginTop="-4dp"
             android:importantForAccessibility="no"
@@ -45,7 +45,7 @@
             style="@style/WidgetConversationItemAvatarIncoming"
             android:layout_width="@dimen/contact_icon_view_normal_size"
             android:layout_height="@dimen/contact_icon_view_normal_size"
-            android:layout_centerVertical="true"
+            android:layout_gravity="center_vertical"
             android:scaleType="fitXY"
             android:importantForAccessibility="no"
             android:contentDescription="@null" />
diff --git a/res/layout/widget_message_item_outgoing.xml b/res/layout/widget_message_item_outgoing.xml
index 86c9076..3fa51c1 100644
--- a/res/layout/widget_message_item_outgoing.xml
+++ b/res/layout/widget_message_item_outgoing.xml
@@ -36,7 +36,7 @@
             style="@style/WidgetConversationItemOutgoingAvatarShadow"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
+            android:layout_gravity="center_vertical"
             android:src="@drawable/ic_widget_avatar_shadow"
             android:layout_marginTop="-4dp"
             android:importantForAccessibility="no"
@@ -45,7 +45,7 @@
             android:id="@+id/avatarView"
             android:layout_width="@dimen/contact_icon_view_normal_size"
             android:layout_height="@dimen/contact_icon_view_normal_size"
-            android:layout_centerVertical="true"
+            android:layout_gravity="center_vertical"
             android:scaleType="fitXY"
             android:importantForAccessibility="no"
             android:contentDescription="@null" />