diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index a5aab8c1d..5e2116b6a 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -48,17 +48,6 @@
             column="6"/>
     </issue>
 
-    <issue
-        id="MozMultipleConstraintLayouts"
-        message="Flatten the view hierarchy by using one `ConstraintLayout`, if possible. If the alternative is several nested `ViewGroup`, it may not help performance and this may be worth suppressing."
-        errorLine1="    &lt;androidx.constraintlayout.widget.ConstraintLayout"
-        errorLine2="     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/component_tabstray.xml"
-            line="52"
-            column="6"/>
-    </issue>
-
     <issue
         id="MozMultipleConstraintLayouts"
         message="Flatten the view hierarchy by using one `ConstraintLayout`, if possible. If the alternative is several nested `ViewGroup`, it may not help performance and this may be worth suppressing."
@@ -114,17 +103,6 @@
             column="14"/>
     </issue>
 
-    <issue
-        id="MozMultipleConstraintLayouts"
-        message="Flatten the view hierarchy by using one `ConstraintLayout`, if possible. If the alternative is several nested `ViewGroup`, it may not help performance and this may be worth suppressing."
-        errorLine1="    &lt;androidx.constraintlayout.widget.ConstraintLayout"
-        errorLine2="     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/fragment_search_dialog.xml"
-            line="77"
-            column="6"/>
-    </issue>
-
     <issue
         id="MozMultipleConstraintLayouts"
         message="Flatten the view hierarchy by using one `ConstraintLayout`, if possible. If the alternative is several nested `ViewGroup`, it may not help performance and this may be worth suppressing."