diff --git a/tools/check/forbidden_strings_in_layout.txt b/tools/check/forbidden_strings_in_layout.txt
index 3983adb5a6..545983f844 100644
--- a/tools/check/forbidden_strings_in_layout.txt
+++ b/tools/check/forbidden_strings_in_layout.txt
@@ -27,5 +27,6 @@
 android:textSize===9
 
 ### Use `@id` and not `@+id` when referencing ids in layouts
-layout_constraint(.*)="@\+id
-accessibilityTraversal(.*)="@\+id
\ No newline at end of file
+layout_(.*)="@\+id
+accessibilityTraversal(.*)="@\+id
+toolbarId="@\+id
diff --git a/vector/src/main/res/layout/fragment_matrix_profile.xml b/vector/src/main/res/layout/fragment_matrix_profile.xml
index ab55edfa29..f6f6af96ea 100644
--- a/vector/src/main/res/layout/fragment_matrix_profile.xml
+++ b/vector/src/main/res/layout/fragment_matrix_profile.xml
@@ -21,7 +21,7 @@
             app:scrimAnimationDuration="250"
             app:scrimVisibleHeightTrigger="80dp"
             app:titleEnabled="false"
-            app:toolbarId="@+id/matrixProfileToolbar">
+            app:toolbarId="@id/matrixProfileToolbar">
 
             <ViewStub
                 android:id="@+id/matrixProfileHeaderView"
diff --git a/vector/src/main/res/layout/fragment_space_directory.xml b/vector/src/main/res/layout/fragment_space_directory.xml
index 3d5932df4a..759d647360 100644
--- a/vector/src/main/res/layout/fragment_space_directory.xml
+++ b/vector/src/main/res/layout/fragment_space_directory.xml
@@ -20,7 +20,7 @@
             app:scrimAnimationDuration="250"
             app:scrimVisibleHeightTrigger="120dp"
             app:titleEnabled="false"
-            app:toolbarId="@+id/toolbar">
+            app:toolbarId="@id/toolbar">
 
             <FrameLayout
                 android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/fragment_space_restricted_select.xml b/vector/src/main/res/layout/fragment_space_restricted_select.xml
index d2cdcccfba..41c6b319fb 100644
--- a/vector/src/main/res/layout/fragment_space_restricted_select.xml
+++ b/vector/src/main/res/layout/fragment_space_restricted_select.xml
@@ -20,7 +20,7 @@
             app:scrimAnimationDuration="250"
             app:scrimVisibleHeightTrigger="120dp"
             app:titleEnabled="false"
-            app:toolbarId="@+id/toolbar">
+            app:toolbarId="@id/toolbar">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/item_autocomplete_command.xml b/vector/src/main/res/layout/item_autocomplete_command.xml
index f0dfbb04be..d519a50fdd 100644
--- a/vector/src/main/res/layout/item_autocomplete_command.xml
+++ b/vector/src/main/res/layout/item_autocomplete_command.xml
@@ -39,7 +39,7 @@
         style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/commandName"
+        android:layout_below="@id/commandName"
         android:layout_alignParentStart="true"
         android:layout_gravity="center_vertical"
         android:maxLines="2"
diff --git a/vector/src/main/res/layout/item_search_result.xml b/vector/src/main/res/layout/item_search_result.xml
index 21fb40e880..b1532b6124 100644
--- a/vector/src/main/res/layout/item_search_result.xml
+++ b/vector/src/main/res/layout/item_search_result.xml
@@ -40,7 +40,7 @@
         style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/messageMemberNameView"
+        android:layout_alignBaseline="@id/messageMemberNameView"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:textColor="?vctr_content_secondary"
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 310774bc91..ed6e501d49 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -11,7 +11,7 @@
         android:id="@+id/messageSelectedBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignBottom="@+id/informationBottom"
+        android:layout_alignBottom="@id/informationBottom"
         android:layout_alignParentTop="true"
         android:background="@drawable/highlighted_message_background" />
 
@@ -46,7 +46,7 @@
         style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/messageMemberNameView"
+        android:layout_alignBaseline="@id/messageMemberNameView"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
@@ -145,7 +145,7 @@
         android:id="@+id/messageSendStateImageView"
         android:layout_width="@dimen/item_event_message_state_size"
         android:layout_height="@dimen/item_event_message_state_size"
-        android:layout_alignBottom="@+id/viewStubContainer"
+        android:layout_alignBottom="@id/viewStubContainer"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
@@ -160,7 +160,7 @@
         android:id="@+id/eventSendingIndicator"
         android:layout_width="@dimen/item_event_message_state_size"
         android:layout_height="@dimen/item_event_message_state_size"
-        android:layout_alignBottom="@+id/viewStubContainer"
+        android:layout_alignBottom="@id/viewStubContainer"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
@@ -175,7 +175,7 @@
         android:id="@+id/informationBottom"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/viewStubContainer"
+        android:layout_below="@id/viewStubContainer"
         android:layout_toEndOf="@id/messageStartGuideline"
         android:addStatesFromChildren="true"
         android:orientation="vertical">
diff --git a/vector/src/main/res/layout/item_timeline_event_base_state.xml b/vector/src/main/res/layout/item_timeline_event_base_state.xml
index 5d734b442a..13fda00bcd 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_state.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_state.xml
@@ -11,7 +11,7 @@
         android:id="@+id/messageSelectedBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignBottom="@+id/informationBottom"
+        android:layout_alignBottom="@id/informationBottom"
         android:layout_alignParentTop="true"
         android:background="@drawable/highlighted_message_background" />
 
@@ -84,7 +84,7 @@
         android:id="@+id/messageFailToSendIndicator"
         android:layout_width="14dp"
         android:layout_height="14dp"
-        android:layout_alignTop="@+id/viewStubContainer"
+        android:layout_alignTop="@id/viewStubContainer"
         android:layout_marginStart="2dp"
         android:layout_toEndOf="@id/viewStubContainer"
         android:contentDescription="@string/a11y_error_message_not_sent"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index 2c9cb691e7..0049cca3f9 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
@@ -142,7 +142,7 @@
         android:id="@+id/mergedSumContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/creationTile"
+        android:layout_below="@id/creationTile"
         android:layout_marginTop="8dp">
 
         <ImageView
@@ -192,7 +192,7 @@
         android:id="@+id/itemMergedSeparatorView"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_below="@+id/mergedSumContainer"
+        android:layout_below="@id/mergedSumContainer"
         android:layout_marginTop="4dp"
         android:background="?vctr_list_separator" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
index abcd679dea..bf6556b518 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
@@ -72,7 +72,7 @@
         android:id="@+id/itemMergedSeparatorView"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_below="@+id/mergedUTDTile"
+        android:layout_below="@id/mergedUTDTile"
         android:layout_marginTop="4dp"
         android:background="?vctr_list_separator" />