diff --git a/app/src/main/res/layout/footer_files_selection.xml b/app/src/main/res/layout/footer_files_selection.xml
index 00891b8b..aa92e3a3 100644
--- a/app/src/main/res/layout/footer_files_selection.xml
+++ b/app/src/main/res/layout/footer_files_selection.xml
@@ -2,7 +2,7 @@
   SPDX-FileCopyrightText: 2024 The Calyx Institute
   SPDX-License-Identifier: Apache-2.0
   -->
-<androidx.appcompat.widget.AppCompatButton xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/button"
     style="@style/SudPrimaryButton"
@@ -10,8 +10,7 @@
     android:layout_height="wrap_content"
     android:layout_gravity="bottom|end"
     android:layout_marginEnd="16dp"
-    android:drawableStart="@drawable/ic_cloud_restore"
-    android:drawablePadding="8dp"
     android:drawableTint="?android:textColorPrimaryInverse"
+    app:icon="@drawable/ic_cloud_restore"
     android:text="@string/select_files_button_restore"
     app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior" />
diff --git a/app/src/main/res/layout/header_files_selection.xml b/app/src/main/res/layout/header_files_selection.xml
index 615c6f2e..b001a55a 100644
--- a/app/src/main/res/layout/header_files_selection.xml
+++ b/app/src/main/res/layout/header_files_selection.xml
@@ -7,6 +7,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/background"
     android:paddingBottom="16dp">
 
     <ImageView
diff --git a/storage/lib/src/main/res/layout/item_file.xml b/storage/lib/src/main/res/layout/item_file.xml
index 86508bbb..77aa0cec 100644
--- a/storage/lib/src/main/res/layout/item_file.xml
+++ b/storage/lib/src/main/res/layout/item_file.xml
@@ -44,7 +44,7 @@
         app:layout_constraintTop_toBottomOf="@+id/nameView"
         tools:text="24h ago - 23 MB" />
 
-    <androidx.appcompat.widget.AppCompatCheckBox
+    <CheckBox
         android:id="@+id/checkBox"
         android:layout_width="48dp"
         android:layout_height="48dp"