diff --git a/app/src/main/res/layout/row_title_value.xml b/app/src/main/res/layout/row_title_value.xml
index c89838b7..1aa21a3d 100644
--- a/app/src/main/res/layout/row_title_value.xml
+++ b/app/src/main/res/layout/row_title_value.xml
@@ -6,15 +6,15 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:background="?selectableItemBackground"
-	android:padding="16dp">
+	android:paddingStart="24dp"
+	android:paddingEnd="24dp">
 
 	<androidx.appcompat.widget.AppCompatTextView
 		android:id="@+id/title"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginStart="8dp"
-		android:layout_marginTop="8dp"
-		android:layout_marginEnd="8dp"
+		android:layout_marginTop="16dp"
+		android:layout_marginBottom="16dp"
 		android:textSize="18sp"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintHorizontal_bias="0.0"
@@ -25,11 +25,8 @@
 	<androidx.appcompat.widget.AppCompatTextView
 		android:id="@+id/value"
 		android:layout_width="0dp"
-		android:layout_height="16dp"
+		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
-		android:layout_marginTop="8dp"
-		android:layout_marginEnd="8dp"
-		android:layout_marginBottom="8dp"
 		android:ellipsize="end"
 		android:gravity="end"
 		android:maxLines="1"
diff --git a/app/src/main/res/layout/row_title_value_action.xml b/app/src/main/res/layout/row_title_value_action.xml
index abac5442..08e8dd96 100644
--- a/app/src/main/res/layout/row_title_value_action.xml
+++ b/app/src/main/res/layout/row_title_value_action.xml
@@ -6,16 +6,15 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:background="?selectableItemBackground"
-	android:padding="16dp">
+	android:paddingStart="24dp"
+	android:paddingEnd="24dp">
 
 	<androidx.appcompat.widget.AppCompatTextView
 		android:id="@+id/title"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_marginStart="8dp"
-		android:layout_marginTop="8dp"
-		android:layout_marginEnd="8dp"
-		android:layout_marginBottom="8dp"
+		android:layout_marginTop="16dp"
+		android:layout_marginBottom="16dp"
 		android:textSize="18sp"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintHorizontal_bias="0.0"
@@ -28,9 +27,6 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
-		android:layout_marginTop="8dp"
-		android:layout_marginEnd="8dp"
-		android:layout_marginBottom="8dp"
 		android:ellipsize="end"
 		android:gravity="end|center_vertical"
 		android:maxLines="1"
@@ -45,14 +41,14 @@
 		android:id="@+id/action"
 		android:layout_width="32dp"
 		android:layout_height="32dp"
-		android:layout_marginTop="4dp"
-		android:layout_marginBottom="4dp"
 		android:background="?selectableItemBackgroundBorderless"
 		android:padding="4dp"
-		android:visibility="visible"
+		android:layout_marginStart="16dp"
+		android:visibility="gone"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintStart_toEndOf="@+id/value"
 		tools:src="@drawable/ic_close_white_24dp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file