diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index c04306d890..ef8d88a327 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -19,28 +19,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `lineHeight` is only used in API level 28 and higher (current min is 21)"
-        errorLine1="                android:lineHeight=&quot;24sp&quot;"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/activity_migration.xml"
-            line="51"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `lineHeight` is only used in API level 28 and higher (current min is 21)"
-        errorLine1="                android:lineHeight=&quot;24sp&quot;"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/activity_migration.xml"
-            line="69"
-            column="17"/>
-    </issue>
-
     <issue
         id="UnusedAttribute"
         message="Attribute `android:foreground` has no effect on API levels lower than 23 (current min is 21)"
@@ -63,105 +41,6 @@
             column="9"/>
     </issue>
 
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `lineHeight` is only used in API level 28 and higher (current min is 21)"
-        errorLine1="        android:lineHeight=&quot;18sp&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/custom_search_engine.xml"
-            line="59"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `lineHeight` is only used in API level 28 and higher (current min is 21)"
-        errorLine1="            android:lineHeight=&quot;24sp&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/fragment_onboarding_home_dialog.xml"
-            line="39"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `lineHeight` is only used in API level 28 and higher (current min is 21)"
-        errorLine1="            android:lineHeight=&quot;24sp&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/fragment_onboarding_home_dialog.xml"
-            line="53"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `lineHeight` is only used in API level 28 and higher (current min is 21)"
-        errorLine1="            android:lineHeight=&quot;20sp&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/fragment_onboarding_home_dialog.xml"
-            line="80"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `lineHeight` is only used in API level 28 and higher (current min is 21)"
-        errorLine1="            android:lineHeight=&quot;20sp&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/fragment_onboarding_home_dialog.xml"
-            line="103"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `lineHeight` is only used in API level 28 and higher (current min is 21)"
-        errorLine1="            android:lineHeight=&quot;20sp&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/fragment_onboarding_home_dialog.xml"
-            line="129"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `lineHeight` is only used in API level 28 and higher (current min is 21)"
-        errorLine1="            android:lineHeight=&quot;20sp&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/fragment_onboarding_home_dialog.xml"
-            line="152"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `lineHeight` is only used in API level 28 and higher (current min is 21)"
-        errorLine1="            android:lineHeight=&quot;20sp&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/fragment_onboarding_home_dialog.xml"
-            line="178"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `lineHeight` is only used in API level 28 and higher (current min is 21)"
-        errorLine1="            android:lineHeight=&quot;20sp&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/layout/fragment_onboarding_home_dialog.xml"
-            line="201"
-            column="13"/>
-    </issue>
-
     <issue
         id="UnusedAttribute"
         message="Attribute `android:foreground` has no effect on API levels lower than 23 (current min is 21)"
diff --git a/app/src/main/res/layout/custom_search_engine.xml b/app/src/main/res/layout/custom_search_engine.xml
index 0922b3ff60..dcc10f6916 100644
--- a/app/src/main/res/layout/custom_search_engine.xml
+++ b/app/src/main/res/layout/custom_search_engine.xml
@@ -56,7 +56,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/search_add_custom_engine_search_string_example"
-        android:lineHeight="18sp"
+        app:lineHeight="18sp"
         android:labelFor="@id/edit_search_string"
         android:textColor="@android:color/tertiary_text_dark" />
 
diff --git a/app/src/main/res/layout/fragment_onboarding_home_dialog.xml b/app/src/main/res/layout/fragment_onboarding_home_dialog.xml
index 06ecb7e4d1..b6ec4e2bb4 100644
--- a/app/src/main/res/layout/fragment_onboarding_home_dialog.xml
+++ b/app/src/main/res/layout/fragment_onboarding_home_dialog.xml
@@ -36,7 +36,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:layout_marginHorizontal="@dimen/oboarding_home_dialog_margin_horizontal"
-            android:lineHeight="24sp"
+            app:lineHeight="24sp"
             android:textAppearance="@style/Header20TextStyle"
             android:textAlignment="center"
             app:layout_constraintEnd_toEndOf="parent"
@@ -49,7 +49,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="40dp"
             android:layout_marginHorizontal="@dimen/oboarding_home_dialog_margin_horizontal"
-            android:lineHeight="24sp"
+            app:lineHeight="24sp"
             android:textAppearance="@style/Body14TextStyle"
             android:text="@string/onboarding_home_screen_description_2"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -76,7 +76,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/oboarding_home_dialog_margin_horizontal"
             android:layout_marginTop="26dp"
-            android:lineHeight="20sp"
+            app:lineHeight="20sp"
             android:textAppearance="@style/Header14TextStyle"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/home_icon"
@@ -98,7 +98,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:layout_marginEnd="@dimen/oboarding_home_dialog_margin_horizontal"
-            android:lineHeight="20sp"
+            app:lineHeight="20sp"
             android:text="@string/onboarding_home_screen_section_home_description_2"
             android:textAppearance="@style/Body14TextStyle"
             app:layout_constraintEnd_toEndOf="parent"
@@ -124,7 +124,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/oboarding_home_dialog_margin_horizontal"
             android:layout_marginTop="26dp"
-            android:lineHeight="20sp"
+            app:lineHeight="20dp"
             android:text="@string/onboarding_home_screen_section_cleaner_tab_tray_title_2"
             android:textAppearance="@style/Header14TextStyle"
             app:layout_constraintEnd_toEndOf="parent"
@@ -147,7 +147,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:layout_marginEnd="@dimen/oboarding_home_dialog_margin_horizontal"
-            android:lineHeight="20sp"
+            app:lineHeight="20sp"
             android:text="@string/onboarding_home_screen_section_cleaner_tab_tray_description_2"
             android:textAppearance="@style/Body14TextStyle"
             app:layout_constraintEnd_toEndOf="parent"
@@ -173,7 +173,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/oboarding_home_dialog_margin_horizontal"
             android:layout_marginTop="26dp"
-            android:lineHeight="20sp"
+            app:lineHeight="20sp"
             android:text="@string/onboarding_home_screen_section_useful_history_title_2"
             android:textAppearance="@style/Header14TextStyle"
             app:layout_constraintEnd_toEndOf="parent"
@@ -196,7 +196,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:layout_marginEnd="@dimen/oboarding_home_dialog_margin_horizontal"
-            android:lineHeight="20sp"
+            app:lineHeight="20sp"
             android:text="@string/onboarding_home_screen_section_useful_history_description_2"
             android:textAppearance="@style/Body14TextStyle"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/settings_https_only.xml b/app/src/main/res/layout/settings_https_only.xml
index ec6cb92af4..0d82c6df7f 100644
--- a/app/src/main/res/layout/settings_https_only.xml
+++ b/app/src/main/res/layout/settings_https_only.xml
@@ -17,7 +17,7 @@
         android:layout_marginTop="16dp"
         android:layout_marginBottom="2dp"
         android:clickable="false"
-        android:lineHeight="24.sp"
+        app:lineHeight="24.sp"
         android:text="@string/preferences_https_only_title"
         android:textAppearance="@style/ListItemTextStyle"
         android:textSize="16sp"
@@ -31,7 +31,7 @@
         android:id="@+id/https_only_summary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:lineHeight="16.sp"
+        app:lineHeight="16.sp"
         android:textColor="?attr/textSecondary"
         android:textColorLink="?attr/textSecondary"
         android:textSize="12sp"