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 2b3e7f62..8ca8162d 100644
--- a/app/src/main/res/layout/row_title_value_action.xml
+++ b/app/src/main/res/layout/row_title_value_action.xml
@@ -1,68 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/container"
 	android:layout_width="match_parent"
-	android:layout_height="48dp"
-	android:background="?selectableItemBackground">
+	android:layout_height="48dp">
 
-	<androidx.appcompat.widget.AppCompatTextView
-		android:id="@+id/title"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="16dp"
-		android:layout_marginBottom="16dp"
-		android:textSize="16sp"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintHorizontal_bias="0.0"
-		app:layout_constraintStart_toStartOf="@+id/guidelineStart"
-		app:layout_constraintTop_toTopOf="parent"
-		tools:text="Title" />
+	<include layout="@layout/layout_swipe_to_delete" />
 
-	<androidx.appcompat.widget.AppCompatTextView
-		android:id="@+id/value"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
-		android:layout_marginEnd="8dp"
-		android:ellipsize="end"
-		android:gravity="end|center_vertical"
-		android:maxLines="1"
-		android:textSize="14sp"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintEnd_toStartOf="@+id/action"
-		app:layout_constraintStart_toEndOf="@+id/title"
-		app:layout_constraintTop_toTopOf="parent"
-		tools:text="Value" />
+	<androidx.constraintlayout.widget.ConstraintLayout
+		android:id="@+id/foreground"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:background="@color/gray_dark"
+		android:foreground="?selectableItemBackground">
 
-	<androidx.appcompat.widget.AppCompatImageView
-		android:id="@+id/action"
-		android:layout_width="32dp"
-		android:layout_height="32dp"
-		android:background="?selectableItemBackgroundBorderless"
-		android:padding="4dp"
-		android:visibility="gone"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
-		app:layout_constraintStart_toEndOf="@+id/value"
-		app:layout_constraintTop_toTopOf="parent"
-		tools:src="@drawable/ic_close"
-		tools:visibility="visible" />
+		<androidx.appcompat.widget.AppCompatTextView
+			android:id="@+id/title"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="16dp"
+			android:layout_marginBottom="16dp"
+			android:textSize="16sp"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintHorizontal_bias="0.0"
+			app:layout_constraintStart_toStartOf="@+id/guidelineStart"
+			app:layout_constraintTop_toTopOf="parent"
+			tools:text="Title" />
 
-	<androidx.constraintlayout.widget.Guideline
-		android:id="@+id/guidelineStart"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		app:layout_constraintGuide_begin="16dp" />
+		<androidx.appcompat.widget.AppCompatTextView
+			android:id="@+id/value"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			android:layout_marginEnd="8dp"
+			android:ellipsize="end"
+			android:gravity="end|center_vertical"
+			android:maxLines="1"
+			android:textSize="14sp"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toStartOf="@+id/action"
+			app:layout_constraintStart_toEndOf="@+id/title"
+			app:layout_constraintTop_toTopOf="parent"
+			tools:text="Value" />
 
-	<androidx.constraintlayout.widget.Guideline
-		android:id="@+id/guidelineEnd"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		app:layout_constraintGuide_end="8dp" />
+		<androidx.appcompat.widget.AppCompatImageView
+			android:id="@+id/action"
+			android:layout_width="32dp"
+			android:layout_height="32dp"
+			android:background="?selectableItemBackgroundBorderless"
+			android:padding="4dp"
+			android:visibility="gone"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
+			app:layout_constraintStart_toEndOf="@+id/value"
+			app:layout_constraintTop_toTopOf="parent"
+			tools:src="@drawable/ic_close"
+			tools:visibility="visible" />
 
+		<androidx.constraintlayout.widget.Guideline
+			android:id="@+id/guidelineStart"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			app:layout_constraintGuide_begin="16dp" />
+
+		<androidx.constraintlayout.widget.Guideline
+			android:id="@+id/guidelineEnd"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			app:layout_constraintGuide_end="8dp" />
+
+
+	</androidx.constraintlayout.widget.ConstraintLayout>
+
+</FrameLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file