diff --git a/app/src/main/res/layout/fragment_tracking_protection_blocking.xml b/app/src/main/res/layout/fragment_tracking_protection_blocking.xml
index a746c009f..76a8852bd 100644
--- a/app/src/main/res/layout/fragment_tracking_protection_blocking.xml
+++ b/app/src/main/res/layout/fragment_tracking_protection_blocking.xml
@@ -17,8 +17,8 @@
             android:fontFamily="@font/metropolis_bold"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/tracking_protection_item_height"
-            android:layout_marginStart="72dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginStart="@dimen/top_bar_alignment_margin_start"
+            android:layout_marginEnd="@dimen/tracking_protection_item_margin_end"
             android:paddingStart="0dp"
             android:paddingEnd="0dp"
             android:text="@string/enhanced_tracking_protection_blocked" />
diff --git a/app/src/main/res/layout/locale_settings_item.xml b/app/src/main/res/layout/locale_settings_item.xml
index 31fa8cd68..3dfee8628 100644
--- a/app/src/main/res/layout/locale_settings_item.xml
+++ b/app/src/main/res/layout/locale_settings_item.xml
@@ -6,7 +6,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="48dp">
+    android:layout_height="@dimen/locale_item_height">
 
     <ImageView
         android:id="@+id/locale_selected_icon"
diff --git a/app/src/main/res/layout/logins_item.xml b/app/src/main/res/layout/logins_item.xml
index 6a311748a..da5219276 100644
--- a/app/src/main/res/layout/logins_item.xml
+++ b/app/src/main/res/layout/logins_item.xml
@@ -14,10 +14,10 @@
 
     <FrameLayout
         android:id="@+id/favicon_wrapper"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:padding="4dp"
-        android:layout_marginStart="16dp"
+        android:layout_width="@dimen/history_favicon_width_height"
+        android:layout_height="@dimen/history_favicon_width_height"
+        android:padding="@dimen/saved_logins_item_padding"
+        android:layout_marginStart="@dimen/saved_logins_item_margin_start"
         android:background="@drawable/top_sites_background"
         android:layout_gravity="center"
         android:importantForAccessibility="noHideDescendants"
@@ -26,8 +26,8 @@
         app:layout_constraintBottom_toBottomOf="parent">
         <ImageView
             android:id="@+id/favicon_image"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/preference_icon_drawable_size"
+            android:layout_height="@dimen/preference_icon_drawable_size"
             android:layout_gravity="center"
             android:adjustViewBounds="true"
             android:importantForAccessibility="no"
@@ -38,8 +38,8 @@
         android:id="@+id/webAddressView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="48dp"
+        android:layout_marginStart="@dimen/saved_logins_item_margin_start"
+        android:layout_marginEnd="@dimen/saved_logins_item_margin_end"
         android:ellipsize="middle"
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceListItem"
@@ -55,8 +55,8 @@
         android:id="@+id/usernameView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="48dp"
+        android:layout_marginStart="@dimen/saved_logins_item_margin_start"
+        android:layout_marginEnd="@dimen/saved_logins_item_margin_end"
         android:ellipsize="middle"
         android:singleLine="true"
         android:textColor="?secondaryText"
diff --git a/app/src/main/res/layout/preference_cat_style.xml b/app/src/main/res/layout/preference_cat_style.xml
index e42206621..a1f6810bd 100644
--- a/app/src/main/res/layout/preference_cat_style.xml
+++ b/app/src/main/res/layout/preference_cat_style.xml
@@ -8,7 +8,7 @@
     style="?android:attr/listViewStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="72dp"
+    android:layout_marginStart="@dimen/top_bar_alignment_margin_start"
     android:layout_marginTop="16dp"
     android:gravity="start|center_vertical"
     android:textAlignment="viewStart"
diff --git a/app/src/main/res/layout/preference_widget_radiobutton.xml b/app/src/main/res/layout/preference_widget_radiobutton.xml
index ae73ed749..9da09ef28 100644
--- a/app/src/main/res/layout/preference_widget_radiobutton.xml
+++ b/app/src/main/res/layout/preference_widget_radiobutton.xml
@@ -29,7 +29,7 @@
     <TextView
         android:id="@+id/title"
         android:layout_width="0dp"
-        android:layout_marginStart="8dp"
+        android:layout_marginStart="@dimen/radiobutton_preference_margin_start"
         android:layout_height="wrap_content"
         android:gravity="center|start"
         android:layout_marginEnd="@dimen/radio_button_preference_horizontal"
diff --git a/app/src/main/res/layout/tracking_protection_category.xml b/app/src/main/res/layout/tracking_protection_category.xml
index 560295834..324f4d028 100644
--- a/app/src/main/res/layout/tracking_protection_category.xml
+++ b/app/src/main/res/layout/tracking_protection_category.xml
@@ -11,8 +11,8 @@
 
     <ImageView
         android:id="@+id/trackingProtectionCategoryIcon"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="@dimen/preference_icon_drawable_size"
+        android:layout_height="@dimen/preference_icon_drawable_size"
         android:layout_marginStart="@dimen/library_item_icon_margin_horizontal"
         android:layout_marginTop="@dimen/library_item_icon_margin_vertical"
         android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal"
@@ -27,8 +27,8 @@
         android:id="@+id/trackingProtectionCategoryTitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginTop="12dp"
+        android:layout_marginStart="@dimen/radio_button_drawable_padding"
+        android:layout_marginTop="@dimen/about_list_margin_top"
         android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal"
         android:clickable="false"
         android:textAppearance="@style/ListItemTextStyle"
@@ -44,9 +44,9 @@
         android:id="@+id/trackingProtectionCategoryItemDescription"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
+        android:layout_marginStart="@dimen/radio_button_drawable_padding"
         android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal"
-        android:layout_marginBottom="18dp"
+        android:layout_marginBottom="@dimen/tracking_protection_item_margin_bottom"
         android:clickable="false"
         android:textColor="?attr/secondaryText"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 78842bd21..77620233e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -50,11 +50,14 @@
 
     <!--Preferences-->
     <dimen name="checkbox_preference_padding_vertical">12dp</dimen>
+    <dimen name="radiobutton_preference_margin_start">8dp</dimen>
     <dimen name="top_bar_alignment_margin_start">72dp</dimen>
 
     <!--Quick Settings-->
     <dimen name="quicksettings_item_height">28dp</dimen>
     <dimen name="tracking_protection_item_height">48dp</dimen>
+    <dimen name="tracking_protection_item_margin_end">16dp</dimen>
+    <dimen name="tracking_protection_item_margin_bottom">18dp</dimen>
 
     <dimen name="design_quick_action_sheet_peek_height_min">64dp</dimen>
 
@@ -116,6 +119,7 @@
     <dimen name="locale_item_text_margin_gone_start">72dp</dimen>
     <dimen name="locale_item_title_size">16sp</dimen>
     <dimen name="locale_item_subtitle_size">12sp</dimen>
+    <dimen name="locale_item_height">48dp</dimen>
 
     <!--Migration Activity-->
     <dimen name="migration_margin_horizontal_large">20dp</dimen>
@@ -157,6 +161,9 @@
     <dimen name="saved_logins_sort_menu_dropdown_chevron_icon_size">12dp</dimen>
     <dimen name="saved_logins_detail_menu_vertical_padding">5dp</dimen>
     <dimen name="saved_logins_end_icon_drawable_padding">16dp</dimen>
+    <dimen name="saved_logins_item_padding">4dp</dimen>
+    <dimen name="saved_logins_item_margin_start">16dp</dimen>
+    <dimen name="saved_logins_item_margin_end">48dp</dimen>
 
     <!-- a11y -->
     <dimen name="accessibility_min_height">48dp</dimen>