diff --git a/app/src/main/java/org/mozilla/fenix/exceptions/ExceptionsUIView.kt b/app/src/main/java/org/mozilla/fenix/exceptions/ExceptionsUIView.kt
index 42c0fd1a7..97019b1ca 100644
--- a/app/src/main/java/org/mozilla/fenix/exceptions/ExceptionsUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/exceptions/ExceptionsUIView.kt
@@ -6,8 +6,8 @@ package org.mozilla.fenix.exceptions
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import android.widget.LinearLayout
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import io.reactivex.Observable
 import io.reactivex.Observer
 import io.reactivex.functions.Consumer
@@ -22,9 +22,9 @@ class ExceptionsUIView(
 ) :
     UIView<ExceptionsState, ExceptionsAction, ExceptionsChange>(container, actionEmitter, changesObservable) {
 
-    override val view: LinearLayout = LayoutInflater.from(container.context)
+    override val view: RecyclerView = LayoutInflater.from(container.context)
         .inflate(R.layout.component_exceptions, container, true)
-        .findViewById(R.id.exceptions_wrapper)
+        .findViewById(R.id.exceptions_list)
 
     init {
         view.exceptions_list.apply {
diff --git a/app/src/main/res/layout/account_auth_error_preference.xml b/app/src/main/res/layout/account_auth_error_preference.xml
index faeeb3333..dfb59e76d 100644
--- a/app/src/main/res/layout/account_auth_error_preference.xml
+++ b/app/src/main/res/layout/account_auth_error_preference.xml
@@ -3,14 +3,15 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
-    android:background="@color/sync_error_background_color">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:background="@color/sync_error_background_color"
+        android:baselineAligned="false">
 
     <FrameLayout
         android:id="@+id/icon_frame"
@@ -30,6 +31,7 @@
         android:layout_marginStart="15dp"
         android:layout_marginEnd="6dp"
         android:paddingStart="16dp"
+        android:paddingEnd="0dp"
         android:paddingTop="16dp"
         android:paddingBottom="16dp"
         android:layout_weight="1">
@@ -46,14 +48,14 @@
             android:visibility="visible"/>
 
         <TextView
-            android:id="@+id/email"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/errorSummary"
-            android:layout_alignStart="@id/errorSummary"
-            android:textColor="@color/sync_error_text_color"
-            android:maxLines="4"
-            android:visibility="gone"/>
+                android:id="@+id/email"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/errorSummary"
+                android:layout_alignStart="@id/errorSummary"
+                android:textColor="@color/sync_error_text_color"
+                android:maxLines="4"
+                android:visibility="gone"/>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/collection_home_list_row.xml b/app/src/main/res/layout/collection_home_list_row.xml
index 02e1205b4..91b4c036a 100644
--- a/app/src/main/res/layout/collection_home_list_row.xml
+++ b/app/src/main/res/layout/collection_home_list_row.xml
@@ -2,117 +2,118 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/item_collection"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="12dp"
-    android:background="@drawable/rounded_all_corners"
-    android:clickable="true"
-    android:clipToPadding="false"
-    android:elevation="5dp"
-    android:focusable="true"
-    android:foreground="?android:attr/selectableItemBackground">
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/item_collection"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:background="@drawable/rounded_all_corners"
+        android:clickable="true"
+        android:clipToPadding="false"
+        android:elevation="5dp"
+        android:focusable="true"
+        android:foreground="?android:attr/selectableItemBackground">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
         <ImageView
-            android:id="@+id/collection_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:importantForAccessibility="no"
-            android:src="@drawable/ic_tab_collection"
-            android:tint="@null"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+                android:id="@+id/collection_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:importantForAccessibility="no"
+                android:src="@drawable/ic_tab_collection"
+                android:tint="@null"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:id="@+id/collection_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="8dp"
-            android:ellipsize="end"
-            android:gravity="start"
-            android:maxLines="1"
-            android:minLines="1"
-            android:textAppearance="@style/Header16TextStyle"
-            app:layout_constrainedWidth="true"
-            app:layout_constraintEnd_toStartOf="@id/chevron"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toEndOf="@+id/collection_icon"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="@tools:sample/lorem/random" />
+                android:id="@+id/collection_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="8dp"
+                android:ellipsize="end"
+                android:gravity="start"
+                android:maxLines="1"
+                android:minLines="1"
+                android:textAppearance="@style/Header16TextStyle"
+                app:layout_constrainedWidth="true"
+                app:layout_constraintEnd_toStartOf="@id/chevron"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toEndOf="@+id/collection_icon"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="@tools:sample/lorem/random" />
 
         <ImageView
-            android:id="@+id/chevron"
-            android:layout_width="10dp"
-            android:layout_height="6dp"
-            android:layout_marginTop="24dp"
-            android:layout_marginEnd="16dp"
-            android:background="@drawable/ic_chevron_down"
-            android:contentDescription="@string/tab_menu"
-            app:layout_constraintEnd_toStartOf="@+id/collection_share_button"
-            app:layout_constraintStart_toEndOf="@+id/collection_title"
-            app:layout_constraintTop_toTopOf="parent" />
+                android:id="@+id/chevron"
+                android:layout_width="10dp"
+                android:layout_height="6dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="16dp"
+                android:background="@drawable/ic_chevron_down"
+                android:contentDescription="@string/tab_menu"
+                app:layout_constraintEnd_toStartOf="@+id/collection_share_button"
+                app:layout_constraintStart_toEndOf="@+id/collection_title"
+                app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:id="@+id/collection_description"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="16dp"
-            android:ellipsize="end"
-            android:maxLines="2"
-            android:minLines="2"
-            android:textAppearance="@style/SubtitleTextStyle"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/collection_share_button"
-            app:layout_constraintStart_toStartOf="@id/collection_title"
-            app:layout_constraintTop_toBottomOf="@id/collection_share_button"
-            tools:text="@tools:sample/lorem/random" />
+                android:id="@+id/collection_description"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="16dp"
+                android:ellipsize="end"
+                android:maxLines="2"
+                android:minLines="2"
+                android:textAppearance="@style/SubtitleTextStyle"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/collection_share_button"
+                app:layout_constraintStart_toStartOf="@id/collection_title"
+                app:layout_constraintTop_toBottomOf="@id/collection_share_button"
+                tools:text="@tools:sample/lorem/random" />
 
         <ImageButton
-            android:id="@+id/collection_share_button"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="30dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/share_header"
-            android:src="@drawable/ic_hollow_share"
-            app:layout_constraintEnd_toStartOf="@id/collection_overflow_button"
-            app:layout_constraintTop_toTopOf="@id/collection_icon" />
+                android:id="@+id/collection_share_button"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="30dp"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:contentDescription="@string/share_header"
+                android:src="@drawable/ic_hollow_share"
+                app:layout_constraintEnd_toStartOf="@id/collection_overflow_button"
+                app:layout_constraintTop_toTopOf="@id/collection_icon" />
 
         <ImageButton
-            android:id="@+id/collection_overflow_button"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="4.5dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/tab_menu"
-            android:src="@drawable/ic_menu"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+                android:id="@+id/collection_overflow_button"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="4.5dp"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:contentDescription="@string/tab_menu"
+                android:src="@drawable/ic_menu"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
         <View
-            android:id="@+id/selected_border"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:alpha="0"
-            android:background="@drawable/session_border"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+                android:id="@+id/selected_border"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:alpha="0"
+                android:background="@drawable/session_border"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/component_bookmark.xml b/app/src/main/res/layout/component_bookmark.xml
index 6507fe3fc..bbc73468c 100644
--- a/app/src/main/res/layout/component_bookmark.xml
+++ b/app/src/main/res/layout/component_bookmark.xml
@@ -2,27 +2,31 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/bookmark_list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+            android:id="@+id/bookmark_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:listitem="@layout/bookmark_row" />
 
     <TextView
-        android:id="@+id/bookmarks_empty_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/bookmarks_empty_message"
-        android:textColor="?secondaryText"
-        android:textSize="16sp"
-        android:visibility="gone" />
+            android:id="@+id/bookmarks_empty_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/bookmarks_empty_message"
+            android:textColor="?secondaryText"
+            android:textSize="16sp"
+            android:visibility="gone" />
+
 </FrameLayout>
diff --git a/app/src/main/res/layout/component_exceptions.xml b/app/src/main/res/layout/component_exceptions.xml
index 8dfda78de..750a61958 100644
--- a/app/src/main/res/layout/component_exceptions.xml
+++ b/app/src/main/res/layout/component_exceptions.xml
@@ -2,14 +2,10 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/exceptions_wrapper"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-    <androidx.recyclerview.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/exceptions_list"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</LinearLayout>
+        android:layout_height="match_parent"
+        tools:listitem="@layout/exception_item"/>
diff --git a/app/src/main/res/layout/component_history.xml b/app/src/main/res/layout/component_history.xml
index 00add25a2..91d9a27a2 100644
--- a/app/src/main/res/layout/component_history.xml
+++ b/app/src/main/res/layout/component_history.xml
@@ -2,38 +2,40 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/history_wrapper"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <ProgressBar
-        android:id="@+id/progress_bar"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-        android:indeterminate="true"
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/history_wrapper"
         android:layout_width="match_parent"
-        android:layout_height="8dp"
-        android:translationY="-3dp"
-        android:visibility="gone"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        android:layout_height="match_parent">
+    <ProgressBar
+            android:id="@+id/progress_bar"
+            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+            android:indeterminate="true"
+            android:layout_width="match_parent"
+            android:layout_height="8dp"
+            android:translationY="-3dp"
+            android:visibility="gone"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
-        android:id="@+id/history_empty_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/history_empty_message"
-        android:textColor="?secondaryText"
-        android:textSize="16sp"
-        android:visibility="gone"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+            android:id="@+id/history_empty_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/history_empty_message"
+            android:textColor="?secondaryText"
+            android:textSize="16sp"
+            android:visibility="gone"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/history_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+            android:id="@+id/history_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:listitem="@layout/history_list_item"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/component_permissions_blocked_by_android.xml b/app/src/main/res/layout/component_permissions_blocked_by_android.xml
index d9fb8a259..5e79878d9 100644
--- a/app/src/main/res/layout/component_permissions_blocked_by_android.xml
+++ b/app/src/main/res/layout/component_permissions_blocked_by_android.xml
@@ -28,7 +28,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceListItemSmall"
-            android:text="@string/phone_feature_blocked_by_android_explanation"/>
+            tools:text="@string/phone_feature_blocked_by_android_explanation"/>
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/settings_button"
diff --git a/app/src/main/res/layout/delete_browsing_data_item.xml b/app/src/main/res/layout/delete_browsing_data_item.xml
index 6f0402968..5c910bf5a 100644
--- a/app/src/main/res/layout/delete_browsing_data_item.xml
+++ b/app/src/main/res/layout/delete_browsing_data_item.xml
@@ -19,6 +19,7 @@
         android:layout_marginBottom="@dimen/library_item_icon_margin_vertical"
         android:background="@drawable/library_icon_reading_list_circle_background"
         android:clickable="false"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/exception_item.xml b/app/src/main/res/layout/exception_item.xml
index 35fee89d6..3b04d569c 100644
--- a/app/src/main/res/layout/exception_item.xml
+++ b/app/src/main/res/layout/exception_item.xml
@@ -54,6 +54,7 @@
         android:layout_marginEnd="16dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:src="@drawable/ic_close"
+        android:contentDescription="@string/history_delete_item"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 6cdc371b4..830708226 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -37,7 +37,7 @@
                 app:layout_constraintTop_toBottomOf="@id/wordmark"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                tools:text="1.0.x (Build #x 🦎 69.x-x)\nAC: 1.0.0"
+                tools:text="1.0.x (Build #x)\nGV: 69.x-x\nAC: 1.0.0"
                 android:textAlignment="center" />
 
         <TextView
diff --git a/app/src/main/res/layout/fragment_select_bookmark_folder.xml b/app/src/main/res/layout/fragment_select_bookmark_folder.xml
index 9abf25382..34d2ac8f4 100644
--- a/app/src/main/res/layout/fragment_select_bookmark_folder.xml
+++ b/app/src/main/res/layout/fragment_select_bookmark_folder.xml
@@ -2,17 +2,19 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/select_bookmark_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/select_bookmark_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recylerView_bookmark_folders"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+            android:id="@+id/recylerView_bookmark_folders"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/bookmark_row"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml b/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml
index 59c8280bd..7d65b3e11 100644
--- a/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml
+++ b/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml
@@ -2,9 +2,9 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="@dimen/site_permissions_exceptions_item_height"
         android:background="?android:attr/selectableItemBackground"
@@ -27,7 +27,8 @@
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
             android:textSize="@dimen/site_permissions_exceptions_item_text_size"
-            android:textColor="?primaryText"/>
+            android:textColor="?primaryText"
+            tools:text="mozilla.com" />
 
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/tab_list_row.xml b/app/src/main/res/layout/tab_list_row.xml
index a510eda60..e994c85ad 100644
--- a/app/src/main/res/layout/tab_list_row.xml
+++ b/app/src/main/res/layout/tab_list_row.xml
@@ -2,86 +2,87 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/item_tab"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="12dp"
-    android:clickable="true"
-    android:clipToPadding="false"
-    android:focusable="true"
-    android:foreground="?android:attr/selectableItemBackground"
-    android:transitionGroup="true"
-    app:cardBackgroundColor="?above"
-    app:cardCornerRadius="@dimen/tab_corner_radius"
-    app:cardElevation="5dp">
+<androidx.cardview.widget.CardView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/item_tab"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
+        android:clickable="true"
+        android:clipToPadding="false"
+        android:focusable="true"
+        android:foreground="?android:attr/selectableItemBackground"
+        android:transitionGroup="true"
+        app:cardBackgroundColor="?above"
+        app:cardCornerRadius="@dimen/tab_corner_radius"
+        app:cardElevation="5dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
         <ImageView
-            android:id="@+id/favicon_image"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="8dp"
-            android:adjustViewBounds="true"
-            android:importantForAccessibility="no"
-            android:scaleType="fitCenter"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+                android:id="@+id/favicon_image"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_margin="8dp"
+                android:adjustViewBounds="true"
+                android:importantForAccessibility="no"
+                android:scaleType="fitCenter"
+                app:layout_constraintDimensionRatio="1:1"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:id="@+id/hostname"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:ellipsize="none"
-            android:singleLine="true"
-            android:textAppearance="@style/Header12TextStyle"
-            app:layout_constraintEnd_toStartOf="@id/close_tab_button"
-            app:layout_constraintStart_toEndOf="@id/favicon_image"
-            app:layout_constraintTop_toTopOf="@id/favicon_image" />
+                android:id="@+id/hostname"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:ellipsize="none"
+                android:singleLine="true"
+                android:textAppearance="@style/Header12TextStyle"
+                app:layout_constraintEnd_toStartOf="@id/close_tab_button"
+                app:layout_constraintStart_toEndOf="@id/favicon_image"
+                app:layout_constraintTop_toTopOf="@id/favicon_image" />
 
         <TextView
-            android:id="@+id/tab_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginBottom="8dp"
-            android:ellipsize="end"
-            android:maxLines="2"
-            android:minLines="2"
-            android:textColor="?primaryText"
-            android:textSize="14sp"
-            app:layout_constraintStart_toEndOf="@id/favicon_image"
-            app:layout_constraintEnd_toEndOf="@id/hostname"
-            app:layout_constraintTop_toBottomOf="@id/hostname"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+                android:id="@+id/tab_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginBottom="8dp"
+                android:ellipsize="end"
+                android:maxLines="2"
+                android:minLines="2"
+                android:textColor="?primaryText"
+                android:textSize="14sp"
+                app:layout_constraintStart_toEndOf="@id/favicon_image"
+                app:layout_constraintEnd_toEndOf="@id/hostname"
+                app:layout_constraintTop_toBottomOf="@id/hostname"
+                app:layout_constraintBottom_toBottomOf="parent"/>
 
         <ImageButton
-            android:id="@+id/close_tab_button"
-            android:layout_width="8dp"
-            android:layout_height="8dp"
-            android:layout_margin="13dp"
-            android:alpha="0.8"
-            android:contentDescription="@string/close_tab"
-            android:src="@drawable/ic_close"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+                android:id="@+id/close_tab_button"
+                android:layout_width="8dp"
+                android:layout_height="8dp"
+                android:layout_margin="13dp"
+                android:alpha="0.8"
+                android:contentDescription="@string/close_tab"
+                android:src="@drawable/ic_close"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
         <View
-            android:id="@+id/selected_border"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@drawable/session_border"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+                android:id="@+id/selected_border"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:background="@drawable/session_border"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>