diff --git a/res/layout/notification_history.xml b/res/layout/notification_history.xml
index 1fc07006106..b397eef6540 100644
--- a/res/layout/notification_history.xml
+++ b/res/layout/notification_history.xml
@@ -16,7 +16,6 @@
 
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:id="@+id/scroll"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -43,6 +42,7 @@
                 android:layout_gravity="center_horizontal"
                 android:contentDescription="@string/notification_history"
                 android:scaleType="fitCenter"
+                android:focusable="false"
                 android:tint="?android:attr/colorControlNormal"
                 android:src="@drawable/ic_history" />
 
@@ -55,6 +55,7 @@
                 android:layout_marginStart="48dp"
                 android:layout_marginEnd="48dp"
                 android:layout_gravity="center_horizontal"
+                android:focusable="true"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:text="@string/notification_history_off_title_extended" />
 
@@ -68,6 +69,7 @@
                 android:layout_marginTop="16dp"
                 android:layout_gravity="center_horizontal"
                 android:textAlignment="center"
+                android:focusable="true"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:text="@string/notification_history_off_summary" />
         </LinearLayout>
@@ -106,11 +108,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:clipChildren="true"
-                        settings:fastScrollEnabled="true"
-                        settings:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
-                        settings:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"
-                        settings:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
-                        settings:fastScrollVerticalTrackDrawable="@drawable/line_drawable"/>
+                        android:scrollbars="none"/>
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </LinearLayout>
@@ -141,11 +139,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:clipChildren="true"
-                        settings:fastScrollEnabled="true"
-                        settings:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
-                        settings:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"
-                        settings:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
-                        settings:fastScrollVerticalTrackDrawable="@drawable/line_drawable"/>
+                        android:scrollbars="none"/>
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </LinearLayout>
diff --git a/res/layout/notification_history_app_layout.xml b/res/layout/notification_history_app_layout.xml
index 7d1f2d73270..a8757fe707e 100644
--- a/res/layout/notification_history_app_layout.xml
+++ b/res/layout/notification_history_app_layout.xml
@@ -16,7 +16,6 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
@@ -84,11 +83,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:clipChildren="true"
-            settings:fastScrollEnabled="true"
-            settings:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
-            settings:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"
-            settings:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
-            settings:fastScrollVerticalTrackDrawable="@drawable/line_drawable"/>
+            android:scrollbars="none"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/res/layout/notification_sbn_log_row.xml b/res/layout/notification_sbn_log_row.xml
index 40c81fa6afd..5fa1b5d8c20 100644
--- a/res/layout/notification_sbn_log_row.xml
+++ b/res/layout/notification_sbn_log_row.xml
@@ -79,6 +79,7 @@
             android:layout_marginEnd="6dp"
             android:paddingTop="1dp"
             android:scaleType="fitCenter"
+            android:contentDescription="@*android:string/notification_work_profile_content_description"
             android:layout_toStartOf="@id/timestamp"
         />