diff --git a/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt b/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt
index 7c9eec504..b1e3c9711 100644
--- a/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt
+++ b/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt
@@ -48,7 +48,8 @@ class TaskViewHolder internal constructor(
     private val metrics: DisplayMetrics,
     private val background: Int,
     private val selectedColor: Int,
-    private val rowPadding: Int,
+    private val rowPaddingDp: Int,
+    private val rowPaddingPx: Int,
     private val linkify: Linkify,
     private val locale: Locale,
     private val markdown: Markdown
@@ -164,15 +165,14 @@ class TaskViewHolder internal constructor(
         }
         when {
             chipGroup.visibility == View.VISIBLE -> {
-                setBottomPadding(rowPadding, chipGroup)
                 setBottomPadding(0, description, nameView)
             }
             description.visibility == View.VISIBLE -> {
-                setBottomPadding(rowPadding, description)
+                setBottomPadding(rowPaddingPx, description)
                 setBottomPadding(0, nameView)
             }
             else -> {
-                setBottomPadding(rowPadding, nameView)
+                setBottomPadding(rowPaddingPx, nameView)
             }
         }
     }
@@ -218,7 +218,12 @@ class TaskViewHolder internal constructor(
     private fun setupChips(filter: Filter, sortByStartDate: Boolean) {
         chipGroup.setContent {
             MdcTheme {
-                ChipGroup(modifier = Modifier.padding(end = 16.dp)) {
+                ChipGroup(
+                    modifier = Modifier.padding(
+                        end = 16.dp,
+                        bottom = rowPaddingDp.dp
+                    )
+                ) {
                     chipProvider.Chips(
                         filter = filter,
                         isSubtask = indent > 0,
@@ -274,8 +279,8 @@ class TaskViewHolder internal constructor(
             description.isSingleLine = false
             description.ellipsize = null
         }
-        setTopPadding(rowPadding, nameView, completeBox, dueDate)
-        setBottomPadding(rowPadding, completeBox, dueDate)
+        setTopPadding(rowPaddingPx, nameView, completeBox, dueDate)
+        setBottomPadding(rowPaddingPx, completeBox, dueDate)
         nameView.textSize = fontSize.toFloat()
         description.textSize = fontSize.toFloat()
         val fontSizeDetails = max(10, fontSize - 2)
diff --git a/app/src/main/java/org/tasks/tasklist/ViewHolderFactory.kt b/app/src/main/java/org/tasks/tasklist/ViewHolderFactory.kt
index 6b230c0c4..05df83781 100644
--- a/app/src/main/java/org/tasks/tasklist/ViewHolderFactory.kt
+++ b/app/src/main/java/org/tasks/tasklist/ViewHolderFactory.kt
@@ -32,7 +32,8 @@ class ViewHolderFactory @Inject constructor(
     private val metrics: DisplayMetrics = context.resources.displayMetrics
     private val background: Int = ResourceResolver.getResourceId(context, R.attr.selectableItemBackground)
     private val selectedColor: Int = ResourceResolver.getData(context, R.attr.colorControlHighlight)
-    private val rowPadding: Int = AndroidUtilities.convertDpToPixels(metrics, preferences.getInt(R.string.p_rowPadding, 16))
+    private val rowPaddingDp = preferences.getInt(R.string.p_rowPadding, 16)
+    private val rowPaddingPx: Int = AndroidUtilities.convertDpToPixels(metrics, rowPaddingDp)
     private val markdown =
         MarkdownProvider(context, preferences).markdown(R.string.p_linkify_task_list)
 
@@ -57,7 +58,8 @@ class ViewHolderFactory @Inject constructor(
                     metrics,
                     background,
                     selectedColor,
-                    rowPadding,
+                    rowPaddingDp,
+                    rowPaddingPx,
                     linkify,
                     locale,
                     markdown