diff --git a/app/src/main/res/layout/component_collection_creation_select_collection.xml b/app/src/main/res/layout/component_collection_creation_select_collection.xml
index f08e5937b..bb2820dd8 100644
--- a/app/src/main/res/layout/component_collection_creation_select_collection.xml
+++ b/app/src/main/res/layout/component_collection_creation_select_collection.xml
@@ -88,7 +88,7 @@
         android:fadingEdgeLength="30dp"
         android:requiresFadingEdge="vertical"
         android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/bottom_button_bar_layout"
+        app:layout_constraintBottom_toTopOf="@id/bottom_button_bar_layout"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/back_button"
diff --git a/app/src/main/res/layout/custom_search_engine.xml b/app/src/main/res/layout/custom_search_engine.xml
index c389ce510..4ea1fd8cd 100644
--- a/app/src/main/res/layout/custom_search_engine.xml
+++ b/app/src/main/res/layout/custom_search_engine.xml
@@ -57,7 +57,7 @@
         android:layout_height="wrap_content"
         android:text="@string/search_add_custom_engine_search_string_example"
         android:lineHeight="18sp"
-        android:labelFor="@+id/edit_search_string"
+        android:labelFor="@id/edit_search_string"
         android:textColor="@android:color/tertiary_text_dark" />
 
     <org.mozilla.fenix.utils.LinkTextView
diff --git a/app/src/main/res/layout/fragment_add_on_permissions.xml b/app/src/main/res/layout/fragment_add_on_permissions.xml
index d7b1c9518..233518664 100644
--- a/app/src/main/res/layout/fragment_add_on_permissions.xml
+++ b/app/src/main/res/layout/fragment_add_on_permissions.xml
@@ -21,7 +21,7 @@
             android:id="@+id/learn_more_label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/add_ons_permissions"
+            android:layout_below="@id/add_ons_permissions"
             android:background="?attr/selectableItemBackground"
             android:padding="16dp"
             android:paddingStart="16dp"
diff --git a/app/src/main/res/layout/fragment_installed_add_on_details.xml b/app/src/main/res/layout/fragment_installed_add_on_details.xml
index d32b326f4..2545ace01 100644
--- a/app/src/main/res/layout/fragment_installed_add_on_details.xml
+++ b/app/src/main/res/layout/fragment_installed_add_on_details.xml
@@ -39,7 +39,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical|end"
-                android:layout_below="@+id/enable_switch"
+                android:layout_below="@id/enable_switch"
                 android:background="?android:attr/selectableItemBackground"
                 android:checked="false"
                 android:clickable="true"
@@ -56,7 +56,7 @@
                 android:id="@+id/settings"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/allow_in_private_browsing_switch"
+                android:layout_below="@id/allow_in_private_browsing_switch"
                 android:background="?android:attr/selectableItemBackground"
                 android:drawablePadding="32dp"
                 android:padding="16dp"
@@ -70,7 +70,7 @@
                 android:id="@+id/details"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/settings"
+                android:layout_below="@id/settings"
                 android:background="?android:attr/selectableItemBackground"
                 android:drawablePadding="32dp"
                 android:padding="16dp"
@@ -84,7 +84,7 @@
                 android:id="@+id/permissions"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/details"
+                android:layout_below="@id/details"
                 android:background="?android:attr/selectableItemBackground"
                 android:drawablePadding="32dp"
                 android:padding="16dp"
@@ -97,7 +97,7 @@
                 android:id="@+id/remove_add_on"
                 style="@style/DestructiveButton"
                 android:layout_marginHorizontal="16dp"
-                android:layout_below="@+id/permissions"
+                android:layout_below="@id/permissions"
                 android:text="@string/mozac_feature_addons_remove" />
         </RelativeLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 4cfc05aff..d85e21d64 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -62,7 +62,7 @@
                 android:id="@+id/search_suggestions_onboarding"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:inflatedId="@+id/search_suggestions_onboarding"
+                android:inflatedId="@id/search_suggestions_onboarding"
                 android:layout="@layout/search_suggestions_onboarding"
                 app:layout_constraintBottom_toTopOf="@id/awesomeBar_barrier"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_sign_out.xml b/app/src/main/res/layout/fragment_sign_out.xml
index 1b6abc701..2f2ea0730 100644
--- a/app/src/main/res/layout/fragment_sign_out.xml
+++ b/app/src/main/res/layout/fragment_sign_out.xml
@@ -27,8 +27,8 @@
         style="@style/SitePermissionCancelButton"
         android:text="@string/sign_out_cancel"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/signOutDisconnect"
-        app:layout_constraintTop_toBottomOf="@+id/sign_out_message" />
+        app:layout_constraintEnd_toStartOf="@id/signOutDisconnect"
+        app:layout_constraintTop_toBottomOf="@id/sign_out_message" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/signOutDisconnect"
@@ -36,5 +36,5 @@
         android:text="@string/sign_out_disconnect"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/sign_out_message" />
+        app:layout_constraintTop_toBottomOf="@id/sign_out_message" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/locale_settings_item.xml b/app/src/main/res/layout/locale_settings_item.xml
index 3dfee8628..511ae58c5 100644
--- a/app/src/main/res/layout/locale_settings_item.xml
+++ b/app/src/main/res/layout/locale_settings_item.xml
@@ -31,9 +31,9 @@
         android:textAlignment="viewStart"
         app:layout_goneMarginStart="@dimen/locale_item_text_margin_gone_start"
         android:textSize="@dimen/locale_item_title_size"
-        app:layout_constraintBottom_toTopOf="@+id/locale_subtitle_text"
+        app:layout_constraintBottom_toTopOf="@id/locale_subtitle_text"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/locale_selected_icon"
+        app:layout_constraintStart_toEndOf="@id/locale_selected_icon"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="English (United States)" />
@@ -51,8 +51,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_goneMarginStart="@dimen/locale_item_text_margin_gone_start"
-        app:layout_constraintStart_toEndOf="@+id/locale_selected_icon"
-        app:layout_constraintTop_toBottomOf="@+id/locale_title_text"
+        app:layout_constraintStart_toEndOf="@id/locale_selected_icon"
+        app:layout_constraintTop_toBottomOf="@id/locale_title_text"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="English (United States)" />
 
diff --git a/app/src/main/res/layout/logins_item.xml b/app/src/main/res/layout/logins_item.xml
index da5219276..08ed87f9f 100644
--- a/app/src/main/res/layout/logins_item.xml
+++ b/app/src/main/res/layout/logins_item.xml
@@ -46,7 +46,7 @@
         android:textColor="?primaryText"
         app:layout_constraintBottom_toTopOf="@id/usernameView"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/favicon_wrapper"
+        app:layout_constraintStart_toEndOf="@id/favicon_wrapper"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="mozilla.org" />
@@ -62,7 +62,7 @@
         android:textColor="?secondaryText"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/favicon_wrapper"
+        app:layout_constraintStart_toEndOf="@id/favicon_wrapper"
         app:layout_constraintTop_toBottomOf="@id/webAddressView"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="mozilla.org" />
diff --git a/app/src/main/res/layout/onboarding_tracking_protection.xml b/app/src/main/res/layout/onboarding_tracking_protection.xml
index 78a7df377..46e07abd6 100644
--- a/app/src/main/res/layout/onboarding_tracking_protection.xml
+++ b/app/src/main/res/layout/onboarding_tracking_protection.xml
@@ -90,4 +90,4 @@
         app:onboardingKeyDescription="@string/onboarding_tracking_protection_strict_button_description_2"
         app:onboardingKeyTitle="@string/onboarding_tracking_protection_strict_option"
         tools:text="Strict" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_widget_radiobutton.xml b/app/src/main/res/layout/preference_widget_radiobutton.xml
index 9da09ef28..f65db43f3 100644
--- a/app/src/main/res/layout/preference_widget_radiobutton.xml
+++ b/app/src/main/res/layout/preference_widget_radiobutton.xml
@@ -38,7 +38,7 @@
         android:textAppearance="?android:attr/textAppearanceListItem"
         app:layout_constraintTop_toTopOf="@id/radio_button"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/radio_button"
+        app:layout_constraintStart_toEndOf="@id/radio_button"
         app:layout_constraintBottom_toBottomOf="@id/radio_button"/>
 
     <TextView
diff --git a/app/src/main/res/layout/switch_with_description.xml b/app/src/main/res/layout/switch_with_description.xml
index 9f7a84aa3..e7c7570c3 100644
--- a/app/src/main/res/layout/switch_with_description.xml
+++ b/app/src/main/res/layout/switch_with_description.xml
@@ -20,7 +20,7 @@
         android:importantForAccessibility="no"
         android:textAppearance="@style/ListItemTextStyle"
         android:textSize="16sp"
-        app:layout_constraintBottom_toTopOf="@+id/trackingProtectionCategoryItemDescription"
+        app:layout_constraintBottom_toTopOf="@id/trackingProtectionCategoryItemDescription"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="parent"
@@ -41,7 +41,7 @@
         app:layout_constraintEnd_toEndOf="@id/trackingProtectionCategoryTitle"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="@id/trackingProtectionCategoryTitle"
-        app:layout_constraintTop_toBottomOf="@+id/trackingProtectionCategoryTitle"
+        app:layout_constraintTop_toBottomOf="@id/trackingProtectionCategoryTitle"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="@tools:sample/lorem" />
 
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 7e878d0fd..3bd6c282d 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -7,7 +7,7 @@
 
     <action
         android:id="@+id/action_global_home"
-        app:destination="@+id/homeFragment"
+        app:destination="@id/homeFragment"
         app:popUpTo="@id/homeFragment"
         app:popUpToInclusive="true" />
 
@@ -56,7 +56,7 @@
         app:destination="@id/settingsFragment" />
     <action
         android:id="@+id/action_global_syncedTabsFragment"
-        app:destination="@+id/syncedTabsFragment" />
+        app:destination="@id/syncedTabsFragment" />
     <action
         android:id="@+id/action_global_privateBrowsingFragment"
         app:destination="@id/privateBrowsingFragment" />
@@ -392,7 +392,7 @@
             app:exitAnim="@anim/slide_out_left"
             app:popEnterAnim="@anim/slide_in_left"
             app:popExitAnim="@anim/slide_out_right"
-            app:popUpTo="@+id/settingsFragment" />
+            app:popUpTo="@id/settingsFragment" />
         <action
             android:id="@+id/action_settingsFragment_to_sitePermissionsFragment"
             app:destination="@id/sitePermissionsFragment"