diff --git a/app/src/main/res/layout/fragment_detail_item.xml b/app/src/main/res/layout/fragment_detail_item.xml
index 3d625b9..758e03c 100644
--- a/app/src/main/res/layout/fragment_detail_item.xml
+++ b/app/src/main/res/layout/fragment_detail_item.xml
@@ -25,7 +25,7 @@
             android:orientation="horizontal"
             android:background="?android:attr/selectableItemBackground"
             android:focusable="true"
-            android:paddingBottom="6dp" android:paddingTop="6dp">
+            android:paddingBottom="6dp" android:paddingTop="6dp" android:paddingEnd="6dp">
         <TextView
                 android:text="Sun, October 31, 2021, 10:43:12"
                 android:layout_width="wrap_content"
@@ -47,13 +47,12 @@
                 app:layout_constraintStart_toEndOf="@id/detail_item_priority_image"
                 android:layout_marginStart="5dp"/>
         <ImageButton
-                android:layout_width="46dp"
+                android:layout_width="28dp"
                 android:layout_height="26dp" app:srcCompat="@drawable/ic_more_horiz_gray_24dp"
                 android:id="@+id/detail_item_menu_button"
                 app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginEnd="7dp"
                 android:background="?android:attr/selectableItemBackground" android:paddingTop="-5dp"
-                app:layout_constraintEnd_toStartOf="@id/detail_item_icon"/>
+                app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="3dp"/>
         <TextView
                 android:text="This is a very very very long message. It could be as long as 1024 charaters, which is a lot more than you'd think. No, really so far this message is barely 180 characters long. I can't believe how long 1024 bytes are. This is outrageous. Oh you know what, I think I won't type the whole thing. This seems a little too long for a sample text. Well, anyway, it was nice chatting. So far this message is about 400 bytes long. So maybe just double what you see and that's that."
                 android:layout_width="0dp"
@@ -64,7 +63,7 @@
                 android:autoLink="web"
                 app:layout_constraintTop_toBottomOf="@id/detail_item_title_text"
                 app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="12dp"
-                app:layout_constraintBottom_toTopOf="@id/detail_item_attachment_image" app:layout_constraintEnd_toStartOf="@id/detail_item_icon" android:layout_marginEnd="12dp"/>
+                app:layout_constraintBottom_toTopOf="@id/detail_item_attachment_image" app:layout_constraintEnd_toStartOf="@id/detail_item_icon" android:layout_marginEnd="6dp"/>
         <TextView
                 android:text="This is an optional title. It can also be a little longer but not too long."
                 android:layout_width="0dp"
@@ -75,7 +74,7 @@
                 android:autoLink="web"
                 app:layout_constraintStart_toStartOf="parent"
                 android:layout_marginStart="12dp" android:textStyle="bold"
-                app:layout_constraintTop_toBottomOf="@+id/detail_item_date_text" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toStartOf="@id/detail_item_icon" android:layout_marginEnd="12dp"/>
+                app:layout_constraintTop_toBottomOf="@+id/detail_item_date_text" app:layout_constraintEnd_toStartOf="@id/detail_item_icon" android:layout_marginEnd="6dp" tools:layout_constraintEnd_toStartOf="@id/detail_item_icon"/>
         <ImageView
                 android:layout_width="16dp"
                 android:layout_height="16dp" app:srcCompat="@drawable/ic_priority_5_24dp"
@@ -88,9 +87,9 @@
                 android:layout_height="wrap_content" app:srcCompat="@drawable/ic_cancel_gray_24dp"
                 android:id="@+id/detail_item_attachment_image" app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/detail_item_message_text"
-                android:layout_marginStart="12dp" android:layout_marginEnd="12dp"
+                android:layout_marginStart="12dp" android:layout_marginEnd="6dp"
                 android:scaleType="centerCrop"
-                android:adjustViewBounds="true" android:maxHeight="150dp" android:layout_marginTop="5dp"
+                android:adjustViewBounds="true" android:maxHeight="150dp" android:layout_marginTop="7dp"
                 app:shapeAppearanceOverlay="@style/roundedCornersImageView" android:visibility="visible"
                 android:layout_marginBottom="3dp" app:layout_constraintBottom_toTopOf="@id/detail_item_tags_text"/>
         <TextView
@@ -100,7 +99,7 @@
                 android:id="@+id/detail_item_tags_text"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="12dp"
-                app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="12dp"
+                app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="6dp"
                 app:layout_constraintTop_toBottomOf="@id/detail_item_attachment_image"
                 app:layout_constraintBottom_toTopOf="@id/detail_item_attachment_file_box"
                 app:layout_constraintHorizontal_bias="0.0" android:layout_marginTop="2dp"
@@ -109,7 +108,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/detail_item_tags_text"
                 android:id="@+id/detail_item_attachment_file_box" app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" android:layout_marginStart="12dp" android:layout_marginEnd="12dp"
+                app:layout_constraintEnd_toEndOf="parent" android:layout_marginStart="12dp" android:layout_marginEnd="6dp"
                 android:visibility="visible" android:layout_marginTop="2dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:clickable="true" android:focusable="true" android:padding="4dp" android:paddingStart="0dp">
@@ -193,8 +192,19 @@
                 app:layout_constraintTop_toBottomOf="@id/detail_item_actions_wrapper" app:layout_constraintBottom_toBottomOf="parent"/>
         <ImageView
                 android:layout_width="wrap_content"
-                android:layout_height="0dp" app:srcCompat="@drawable/ic_notification" android:id="@+id/detail_item_icon" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="9dp" android:visibility="visible" android:maxHeight="48dp" android:maxWidth="48dp" android:adjustViewBounds="true" app:layout_constraintBottom_toTopOf="@+id/detail_item_attachment_image"
-                android:scaleType="fitStart" android:padding="2dp" app:layout_constraintTop_toTopOf="parent" android:layout_marginTop="3dp"/>
+                android:layout_height="0dp"
+                app:srcCompat="@drawable/ic_notification"
+                android:id="@+id/detail_item_icon"
+                android:visibility="visible"
+                android:maxHeight="40dp"
+                android:maxWidth="40dp"
+                android:adjustViewBounds="true"
+                android:scaleType="fitStart"
+                android:padding="0dp"
+                app:layout_constraintTop_toTopOf="@+id/detail_item_date_text"
+                app:layout_constraintBottom_toBottomOf="@+id/detail_item_message_text"
+                app:layout_constraintEnd_toStartOf="@id/detail_item_menu_button"
+                android:layout_marginEnd="6dp"/>
         <androidx.constraintlayout.widget.Guideline android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/guideline2" app:layout_constraintGuide_begin="27dp" android:orientation="horizontal"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>