diff --git a/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt b/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt
index e8804e385..bd7a4c569 100644
--- a/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt
@@ -12,6 +12,7 @@ import android.widget.FrameLayout
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.appcompat.widget.ContentFrameLayout
 import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.updatePadding
 import androidx.core.widget.TextViewCompat
 import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.ContentViewCallback
@@ -124,11 +125,8 @@ class FenixSnackbar private constructor(
             return FenixSnackbar(parent, content, callback, isError).also {
                 it.duration = durationOrAccessibleDuration
 
-                it.view.setPadding(
-                    0,
-                    0,
-                    0,
-                    if (
+                it.view.updatePadding(
+                    bottom = if (
                         isDisplayedWithBrowserToolbar &&
                         shouldUseBottomToolbar &&
                         // If the view passed in is a ContentFrameLayout, it does not matter
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/TabCounter.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/TabCounter.kt
index 3677d6cde..fe015efa0 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/TabCounter.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/TabCounter.kt
@@ -12,6 +12,7 @@ import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.widget.RelativeLayout
+import androidx.core.view.updatePadding
 import kotlinx.android.synthetic.main.mozac_ui_tabcounter_layout.view.*
 import org.mozilla.fenix.R
 import java.text.NumberFormat
@@ -178,7 +179,7 @@ class TabCounter @JvmOverloads constructor(
 
     private fun formatForDisplay(count: Int): String {
         return if (count > MAX_VISIBLE_TABS) {
-            counter_text.setPadding(0, 0, 0, INFINITE_CHAR_PADDING_BOTTOM)
+            counter_text.updatePadding(bottom = INFINITE_CHAR_PADDING_BOTTOM)
             SO_MANY_TABS_OPEN
         } else NumberFormat.getInstance().format(count.toLong())
     }
diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderAdapter.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderAdapter.kt
index ad9aca6e9..d9064ef29 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderAdapter.kt
@@ -8,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
+import androidx.core.view.updatePaddingRelative
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
@@ -86,7 +87,7 @@ class SelectBookmarkFolderAdapter(private val sharedViewModel: BookmarksSharedVi
             }
             val pxToIndent = dpsToIndent.dpToPx(view.context.resources.displayMetrics)
             val padding = pxToIndent * if (folder.depth > maxDepth) maxDepth else folder.depth
-            view.setPadding(padding, 0, 0, 0)
+            view.updatePaddingRelative(start = padding)
         }
 
         companion object {
diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/CollectionsAdapter.kt b/app/src/main/java/org/mozilla/fenix/tabtray/CollectionsAdapter.kt
index 67eeba43b..f80e48406 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/CollectionsAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/CollectionsAdapter.kt
@@ -9,6 +9,7 @@ import android.view.ViewGroup
 import android.widget.CheckedTextView
 import androidx.annotation.VisibleForTesting
 import androidx.core.content.ContextCompat
+import androidx.core.view.updatePaddingRelative
 import androidx.recyclerview.widget.RecyclerView
 import mozilla.components.support.ktx.android.util.dpToPx
 import org.mozilla.fenix.R
@@ -36,7 +37,7 @@ internal class CollectionsAdapter(
     override fun onBindViewHolder(holder: CollectionItemViewHolder, position: Int) {
         if (position == 0) {
             val displayMetrics = holder.textView.context.resources.displayMetrics
-            holder.textView.setPadding(NEW_COLLECTION_PADDING_START.dpToPx(displayMetrics), 0, 0, 0)
+            holder.textView.updatePaddingRelative(start = NEW_COLLECTION_PADDING_START.dpToPx(displayMetrics))
             holder.textView.compoundDrawablePadding =
                 NEW_COLLECTION_DRAWABLE_PADDING.dpToPx(displayMetrics)
             holder.textView.setCompoundDrawablesWithIntrinsicBounds(
diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
index 76574c692..4963c044e 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt
@@ -16,6 +16,7 @@ import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
+import androidx.core.view.updatePadding
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ConcatAdapter
@@ -36,7 +37,6 @@ import mozilla.components.browser.state.selector.getNormalOrPrivateTabs
 import mozilla.components.browser.state.selector.normalTabs
 import mozilla.components.browser.state.selector.privateTabs
 import mozilla.components.browser.state.state.BrowserState
-import mozilla.components.browser.storage.sync.Tab as SyncTab
 import mozilla.components.browser.tabstray.TabViewHolder
 import mozilla.components.feature.syncedtabs.SyncedTabsFeature
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
@@ -51,6 +51,7 @@ import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.tabtray.SaveToCollectionsButtonAdapter.MultiselectModeChange
 import org.mozilla.fenix.tabtray.TabTrayDialogFragmentState.Mode
 import java.text.NumberFormat
+import mozilla.components.browser.storage.sync.Tab as SyncTab
 
 /**
  * View that contains and configures the BrowserAwesomeBar
@@ -493,7 +494,7 @@ class TabTrayView(
 
     private fun updateTabCounter(count: Int): String {
         if (count > MAX_VISIBLE_TABS) {
-            counter_text.setPadding(0, 0, 0, INFINITE_CHAR_PADDING_BOTTOM)
+            counter_text.updatePadding(bottom = INFINITE_CHAR_PADDING_BOTTOM)
             return SO_MANY_TABS_OPEN
         }
         return NumberFormat.getInstance().format(count.toLong())
diff --git a/app/src/main/java/org/mozilla/fenix/utils/Undo.kt b/app/src/main/java/org/mozilla/fenix/utils/Undo.kt
index 6e8997770..543e2b257 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Undo.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Undo.kt
@@ -6,6 +6,7 @@ package org.mozilla.fenix.utils
 
 import android.view.View
 import androidx.appcompat.widget.ContentFrameLayout
+import androidx.core.view.updatePadding
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -70,11 +71,8 @@ fun CoroutineScope.allowUndo(
         val toolbarHeight = view.context.resources
             .getDimensionPixelSize(R.dimen.browser_toolbar_height)
 
-        snackbar.view.setPadding(
-            0,
-            0,
-            0,
-            if (
+        snackbar.view.updatePadding(
+            bottom = if (
                 paddedForBottomToolbar &&
                 shouldUseBottomToolbar &&
                 // If the view passed in is a ContentFrameLayout, it does not matter