diff --git a/app/src/main/res/layout/activity_bug_report.xml b/app/src/main/res/layout/activity_bug_report.xml
index ec497dab7..ae4ec7731 100644
--- a/app/src/main/res/layout/activity_bug_report.xml
+++ b/app/src/main/res/layout/activity_bug_report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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="match_parent"
@@ -9,24 +9,26 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        app:liftOnScroll="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?actionBarSize" />
+            app:layout_collapseMode="pin"
+            app:title="@string/report_bug" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <FrameLayout
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
+        android:layout_height="wrap_content"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
-        <ScrollView
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="0dp"
+            android:layout_weight="1">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -52,14 +54,13 @@
 
             </LinearLayout>
 
-        </ScrollView>
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/sendFab"
+                style="@style/Fab"
+                android:layout_gravity="bottom|end"
+                android:layout_margin="16dp"
+                app:srcCompat="@drawable/ic_send_white_24dp" />
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/sendFab"
-            style="@style/Fab"
-            android:layout_gravity="bottom|end"
-            android:layout_margin="16dp"
-            app:srcCompat="@drawable/ic_send_white_24dp" />
-
-    </FrameLayout>
-</LinearLayout>
\ No newline at end of file
+        </FrameLayout>
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_lock_screen.xml b/app/src/main/res/layout/activity_lock_screen.xml
index 71b192a31..142b5a721 100644
--- a/app/src/main/res/layout/activity_lock_screen.xml
+++ b/app/src/main/res/layout/activity_lock_screen.xml
@@ -45,7 +45,7 @@
             app:cardCornerRadius="8dp"
             app:cardElevation="8dp">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/image"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -56,7 +56,7 @@
         </com.google.android.material.card.MaterialCardView>
     </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/slide"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/bug_report_card_report.xml b/app/src/main/res/layout/bug_report_card_report.xml
index 1f2d73215..f49878e66 100644
--- a/app/src/main/res/layout/bug_report_card_report.xml
+++ b/app/src/main/res/layout/bug_report_card_report.xml
@@ -64,7 +64,7 @@
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:text="@string/bug_report_issue"
-            android:textAppearance="@style/TextViewBody2"
+            android:textAppearance="@style/TextViewOverline"
             android:textColor="?android:textColorSecondary" />
 
         <com.google.android.material.textfield.TextInputLayout
@@ -108,7 +108,7 @@
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:text="@string/login"
-            android:textAppearance="@style/TextViewBody2"
+            android:textAppearance="@style/TextViewOverline"
             android:textColor="?android:textColorSecondary" />
 
         <com.google.android.material.textfield.TextInputLayout