diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitFilesViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitFilesViewHolder.java
index 88cd65f7..f885becc 100644
--- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitFilesViewHolder.java
+++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitFilesViewHolder.java
@@ -101,12 +101,13 @@ public class CommitFilesViewHolder extends BaseViewHolder<CommitFileModel> {
             TransitionManager.beginDelayedTransition(viewGroup, new ChangeBounds());
         }
         if (!expanded) {
-            patch.setText(".....");
+            patch.setVisibility(View.GONE);
             name.setMaxLines(2);
             toggle.setRotation(0.0f);
         } else {
             name.setMaxLines(5);
             setPatchText(pathText);
+            patch.setVisibility(View.VISIBLE);
             toggle.setRotation(180f);
         }
     }
diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GroupedReviewsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GroupedReviewsViewHolder.java
index 996a193b..3630788c 100644
--- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GroupedReviewsViewHolder.java
+++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GroupedReviewsViewHolder.java
@@ -110,11 +110,13 @@ public class GroupedReviewsViewHolder extends BaseViewHolder<TimelineModel> impl
         }
         if (!expanded) {
             minimized.setVisibility(View.GONE);
-            patch.setText(".....");
+            patch.setText(null);
+            patch.setVisibility(View.GONE);
             name.setMaxLines(2);
             toggle.setRotation(0.0f);
         } else {
             minimized.setVisibility(View.VISIBLE);
+            patch.setVisibility(View.VISIBLE);
             name.setMaxLines(5);
             setPatchText(pathText);
             toggle.setRotation(180f);
diff --git a/app/src/main/res/layouts/row_layouts/layout/commit_file_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/commit_file_row_item.xml
index ad0b768c..238587b4 100644
--- a/app/src/main/res/layouts/row_layouts/layout/commit_file_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/commit_file_row_item.xml
@@ -6,7 +6,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/spacing_micro"
-    android:foreground="?android:selectableItemBackground"
     app:cardBackgroundColor="?card_background">
 
     <LinearLayout
@@ -37,6 +36,7 @@
 
             <com.fastaccess.ui.widgets.ForegroundImageView
                 android:id="@+id/toggle"
+                android:background="?selectableItemBackgroundBorderless"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -55,8 +55,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_marginEnd="@dimen/spacing_xs_large">
+            android:layout_marginEnd="@dimen/spacing_xs_large"
+            android:orientation="vertical">
 
             <com.fastaccess.ui.widgets.FontTextView
                 android:id="@+id/patch"
diff --git a/app/src/main/res/layouts/row_layouts/layout/grouped_review_timeline_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/grouped_review_timeline_row_item.xml
index 127b83e2..a0d61681 100644
--- a/app/src/main/res/layouts/row_layouts/layout/grouped_review_timeline_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/grouped_review_timeline_row_item.xml
@@ -26,11 +26,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
-                android:layout_marginEnd="@dimen/avatar_margin_end"
+                android:layout_marginEnd="@dimen/avatar_margin"
                 android:layout_marginStart="@dimen/avatar_margin"
                 android:minHeight="24dp"
                 android:minWidth="24dp"
-                android:padding="@dimen/spacing_normal"
+                android:paddingTop="@dimen/spacing_normal"
+                android:paddingBottom="@dimen/spacing_normal"
                 android:scaleType="centerCrop"
                 tools:src="@drawable/ic_issue_opened"/>
 
@@ -44,7 +45,8 @@
                 android:layout_weight="1"
                 android:ellipsize="end"
                 android:maxLines="2"
-                android:padding="@dimen/spacing_normal"
+                android:paddingTop="@dimen/spacing_normal"
+                android:paddingBottom="@dimen/spacing_normal"
                 android:textColor="?android:textColorPrimary"
                 tools:text="When one acquires"/>
 
@@ -54,7 +56,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
                 android:background="?selectableItemBackgroundBorderless"
-                android:padding="@dimen/spacing_normal"
+                android:paddingTop="@dimen/spacing_normal"
+                android:paddingBottom="@dimen/spacing_normal"
                 android:src="@drawable/ic_arrow_drop_down"/>
 
         </LinearLayout>