diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt
index d9841b27f..716afe38f 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt
@@ -7,6 +7,7 @@ package org.mozilla.fenix.settings
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
+import android.view.View
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.withStyledAttributes
@@ -58,7 +59,9 @@ class DeleteBrowsingDataItem @JvmOverloads constructor(
             )
 
             title.text = resources.getString(titleId)
-            subtitle.text = resources.getString(subtitleId)
+            val subtitleText = resources.getString(subtitleId)
+            subtitle.text = subtitleText
+            if (subtitleText.isBlank()) subtitle.visibility = View.GONE
         }
     }
 
diff --git a/app/src/main/res/layout/delete_browsing_data_item.xml b/app/src/main/res/layout/delete_browsing_data_item.xml
index d5e22a52c..c3d2fdb48 100644
--- a/app/src/main/res/layout/delete_browsing_data_item.xml
+++ b/app/src/main/res/layout/delete_browsing_data_item.xml
@@ -7,8 +7,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="@dimen/library_item_icon_margin_horizontal"
-    android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal"
     android:minHeight="@dimen/library_item_height"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
@@ -16,7 +14,10 @@
         android:id="@+id/checkbox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/library_item_icon_margin_horizontal"
+        android:layout_marginTop="@dimen/library_item_icon_margin_vertical"
         android:layout_marginEnd="16dp"
+        android:layout_marginBottom="@dimen/library_item_icon_margin_vertical"
         android:clickable="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -27,6 +28,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/library_item_icon_margin_horizontal"
+        android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal"
         android:clickable="false"
         android:textAppearance="@style/ListItemTextStyle"
         app:layout_constraintBottom_toTopOf="@id/subtitle"
@@ -41,6 +43,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/library_item_icon_margin_horizontal"
+        android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal"
         android:clickable="false"
         android:textAppearance="@style/SubtitleTextStyle"
         app:layout_constraintBottom_toBottomOf="parent"