diff --git a/res/layout/message_details_activity.xml b/res/layout/message_details_activity.xml
index 39603606f5..d091ef6ce3 100644
--- a/res/layout/message_details_activity.xml
+++ b/res/layout/message_details_activity.xml
@@ -19,6 +19,6 @@
               android:layout_height="wrap_content"
               android:paddingLeft="10dp"
               android:paddingRight="10dp"
-              tools:listitem="@layout/conversation_item_details_item" />
+              tools:listitem="@layout/message_recipient_list_item" />
 
 </LinearLayout>
diff --git a/res/layout/message_details_header.xml b/res/layout/message_details_header.xml
index d34bb1ad50..1b3be55f0e 100644
--- a/res/layout/message_details_header.xml
+++ b/res/layout/message_details_header.xml
@@ -10,12 +10,13 @@
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:visibility="gone"
-              android:textColor="#FFF44336"
               android:textSize="16sp"
               android:padding="5dp"
               tools:visibility="visible"
               android:text="@string/message_details_header__issues_need_your_attention"
-              android:textStyle="bold|italic" />
+              android:drawableLeft="@drawable/ic_dialog_info_light"
+              android:drawableStart="@drawable/ic_dialog_info_light"
+              android:gravity="center_vertical" />
 
     <TableLayout android:id="@+id/metadata_container"
                  android:layout_width="match_parent"
diff --git a/res/layout/message_recipient_list_item.xml b/res/layout/message_recipient_list_item.xml
index f334df1aad..16a1a96925 100644
--- a/res/layout/message_recipient_list_item.xml
+++ b/res/layout/message_recipient_list_item.xml
@@ -58,20 +58,21 @@
         </LinearLayout>
 
         <Button android:id="@+id/conflict_button"
-                android:layout_width="60sp"
+                android:layout_width="wrap_content"
                 android:layout_height="38sp"
                 style="@style/ErrorButton"
                 android:paddingLeft="10dp"
-                android:paddingRight="5dp"
+                android:paddingRight="10dp"
                 android:paddingTop="5dp"
                 android:paddingBottom="5dp"
                 android:layout_gravity="center_vertical"
                 android:drawableLeft="@drawable/ic_error_white_18dp"
                 android:text="@string/message_recipients_list_item__verify"
-                android:visibility="gone"/>
+                android:visibility="gone"
+                tools:visibility="visible" />
 
         <Button android:id="@+id/resend_button"
-                android:layout_width="85sp"
+                android:layout_width="wrap_content"
                 android:layout_height="38sp"
                 style="@style/InfoButton"
                 android:paddingLeft="10dp"
@@ -81,7 +82,8 @@
                 android:layout_gravity="center_vertical"
                 android:drawableLeft="@drawable/ic_refresh_white_18dp"
                 android:text="@string/message_recipients_list_item__resend"
-                android:visibility="gone"/>
+                android:visibility="gone"
+                tools:visibility="visible" />
 
 
     </LinearLayout>