diff --git a/app/src/main/res/layout/add_new_collection_dialog.xml b/app/src/main/res/layout/add_new_collection_dialog.xml
index 99054c9f4..1597fe453 100644
--- a/app/src/main/res/layout/add_new_collection_dialog.xml
+++ b/app/src/main/res/layout/add_new_collection_dialog.xml
@@ -14,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_marginTop="16dp"
-        android:background="?neutralFaded" />
+        android:background="?borderPrimary" />
 
     <ScrollView
         android:id="@+id/scroll_view"
@@ -33,5 +33,5 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_marginBottom="8dp"
-        android:background="?neutralFaded" />
+        android:background="?borderPrimary" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/component_tracking_protection_panel.xml b/app/src/main/res/layout/component_tracking_protection_panel.xml
index a2ddea0d4..8ce8368cf 100644
--- a/app/src/main/res/layout/component_tracking_protection_panel.xml
+++ b/app/src/main/res/layout/component_tracking_protection_panel.xml
@@ -182,7 +182,7 @@
             android:id="@+id/line_divider"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="?neutralFaded"
+            android:background="?borderPrimary"
             app:layout_constraintTop_toBottomOf="@id/tracking_content_loaded" />
 
         <TextView
@@ -274,7 +274,7 @@
             android:layout_height="1dp"
             android:layout_marginTop="12dp"
             android:layout_marginBottom="8dp"
-            android:background="?neutralFaded"
+            android:background="?borderPrimary"
             app:layout_constraintTop_toBottomOf="@id/smartblock_learn_more" />
 
         <androidx.appcompat.widget.LinearLayoutCompat
diff --git a/app/src/main/res/layout/fragment_history_search_dialog.xml b/app/src/main/res/layout/fragment_history_search_dialog.xml
index 49f862209..43b2646e0 100644
--- a/app/src/main/res/layout/fragment_history_search_dialog.xml
+++ b/app/src/main/res/layout/fragment_history_search_dialog.xml
@@ -47,7 +47,7 @@
         android:id="@+id/search_suggestions_hint_divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="?neutralFaded"
+        android:background="?borderPrimary"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/search_suggestions_hint"
         app:layout_constraintEnd_toEndOf="parent"
@@ -91,7 +91,7 @@
         android:id="@+id/pill_wrapper_divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="?neutralFaded"
+        android:background="?borderPrimary"
         app:layout_constraintBottom_toTopOf="@id/pill_wrapper" />
 
     <View
diff --git a/app/src/main/res/layout/fragment_quick_settings_dialog_sheet.xml b/app/src/main/res/layout/fragment_quick_settings_dialog_sheet.xml
index e447f5f99..7247517f8 100644
--- a/app/src/main/res/layout/fragment_quick_settings_dialog_sheet.xml
+++ b/app/src/main/res/layout/fragment_quick_settings_dialog_sheet.xml
@@ -34,7 +34,7 @@
             android:layout_height="1dp"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
-            android:background="?neutralFaded"
+            android:background="?borderPrimary"
             app:layout_constraintBottom_toTopOf="@id/websitePermissionsLayout" />
 
         <FrameLayout
@@ -49,7 +49,7 @@
             android:layout_height="1dp"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
-            android:background="?neutralFaded"
+            android:background="?borderPrimary"
             app:layout_constraintBottom_toTopOf="@id/trackingProtectionLayout" />
 
         <FrameLayout
@@ -64,7 +64,7 @@
             android:layout_height="1dp"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
-            android:background="?neutralFaded"
+            android:background="?borderPrimary"
             app:layout_constraintBottom_toTopOf="@id/clearSiteDataLayout" />
 
         <androidx.constraintlayout.widget.Group
diff --git a/app/src/main/res/layout/fragment_search_dialog.xml b/app/src/main/res/layout/fragment_search_dialog.xml
index f677ef10c..ab051d6ed 100644
--- a/app/src/main/res/layout/fragment_search_dialog.xml
+++ b/app/src/main/res/layout/fragment_search_dialog.xml
@@ -46,7 +46,7 @@
         android:id="@+id/search_suggestions_hint_divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="?neutralFaded"
+        android:background="?borderPrimary"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/search_suggestions_hint"
         app:layout_constraintEnd_toEndOf="parent"
@@ -60,7 +60,6 @@
         app:constraint_referenced_ids="awesome_bar,pill_wrapper"/>
 
     <org.mozilla.fenix.search.awesomebar.AwesomeBarWrapper
-        xmlns:mozac="http://schemas.android.com/apk/res-auto"
         android:id="@+id/awesome_bar"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -146,14 +145,14 @@
         android:id="@+id/fill_link_divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="?neutralFaded"
+        android:background="?borderPrimary"
         app:layout_constraintTop_toBottomOf="@id/fill_link_from_clipboard" />
 
     <View
         android:id="@+id/pill_wrapper_divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="?neutralFaded"
+        android:background="?borderPrimary"
         app:layout_constraintBottom_toTopOf="@id/pill_wrapper" />
 
     <View
diff --git a/app/src/main/res/layout/fragment_share.xml b/app/src/main/res/layout/fragment_share.xml
index 47c389fda..edf766367 100644
--- a/app/src/main/res/layout/fragment_share.xml
+++ b/app/src/main/res/layout/fragment_share.xml
@@ -51,7 +51,7 @@
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginTop="8dp"
-            android:background="?neutralFaded"
+            android:background="?borderPrimary"
             app:layout_constraintBottom_toTopOf="@id/appsShareLayout" />
 
         <androidx.constraintlayout.widget.Group
diff --git a/app/src/main/res/layout/library_separator.xml b/app/src/main/res/layout/library_separator.xml
index 245b9ef68..a22868c54 100644
--- a/app/src/main/res/layout/library_separator.xml
+++ b/app/src/main/res/layout/library_separator.xml
@@ -14,5 +14,5 @@
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:layout_gravity="center"
-        android:background="?neutralFaded"/>
+        android:background="?borderPrimary"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/onboarding_theme_picker.xml b/app/src/main/res/layout/onboarding_theme_picker.xml
index 2e911063b..d45c19098 100644
--- a/app/src/main/res/layout/onboarding_theme_picker.xml
+++ b/app/src/main/res/layout/onboarding_theme_picker.xml
@@ -122,7 +122,7 @@
         android:layout_marginTop="16dp"
         android:layout_marginEnd="1dp"
         android:layout_marginBottom="16dp"
-        android:background="?attr/neutralFaded"
+        android:background="?attr/borderPrimary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/dark_theme_title" />
diff --git a/app/src/main/res/layout/preference_widget_radiobutton_with_info.xml b/app/src/main/res/layout/preference_widget_radiobutton_with_info.xml
index 916480694..ddc0aff0a 100644
--- a/app/src/main/res/layout/preference_widget_radiobutton_with_info.xml
+++ b/app/src/main/res/layout/preference_widget_radiobutton_with_info.xml
@@ -58,7 +58,7 @@
         android:id="@+id/vertical_divider"
         android:layout_width="1dp"
         android:layout_height="0dp"
-        android:background="?neutralFaded"
+        android:background="?borderPrimary"
         android:paddingStart="1dp"
         android:paddingEnd="1dp"
         app:layout_constraintBottom_toBottomOf="parent"