diff --git a/src/main/res/layout/deep_link_login.xml b/src/main/res/layout/deep_link_login.xml
index 0b455ea2c4..4e4cc46d00 100644
--- a/src/main/res/layout/deep_link_login.xml
+++ b/src/main/res/layout/deep_link_login.xml
@@ -46,7 +46,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="middle"
             android:text="@string/placeholder_filename"
-            android:textColor="@color/black"
+            android:textColor="@color/textColor"
             android:textSize="20sp"
             android:textStyle="bold" />
 
diff --git a/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml b/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml
index 7a5378ebeb..887d8988c6 100644
--- a/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml
+++ b/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml
@@ -130,7 +130,7 @@
             android:layout_marginStart="@dimen/standard_margin"
             android:layout_marginLeft="@dimen/standard_margin"
             android:text="@string/upload_direct_camera_upload"
-            android:textColor="@color/black"
+            android:textColor="@color/textColor"
             android:textSize="@dimen/bottom_sheet_text_size" />
 
     </LinearLayout>
diff --git a/src/main/res/layout/files_folder_picker.xml b/src/main/res/layout/files_folder_picker.xml
index 315e56511a..5a04a960bd 100644
--- a/src/main/res/layout/files_folder_picker.xml
+++ b/src/main/res/layout/files_folder_picker.xml
@@ -53,7 +53,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/folder_picker_btn_cancel"
-            android:theme="@style/OutlinedButton"
+            style="@style/OutlinedButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
diff --git a/src/main/res/layout/upload_files_layout.xml b/src/main/res/layout/upload_files_layout.xml
index bc6a9a3d4a..fb6dbe4d25 100644
--- a/src/main/res/layout/upload_files_layout.xml
+++ b/src/main/res/layout/upload_files_layout.xml
@@ -87,7 +87,7 @@
             android:layout_marginRight="@dimen/standard_half_margin"
             android:layout_weight="1"
             android:text="@string/common_cancel"
-            android:theme="@style/OutlinedButton"
+            style="@style/OutlinedButton"
             app:cornerRadius="@dimen/button_corner_radius" />
 
         <com.google.android.material.button.MaterialButton
diff --git a/src/main/res/layout/uploader_layout.xml b/src/main/res/layout/uploader_layout.xml
index 19cacb276d..74e1099511 100644
--- a/src/main/res/layout/uploader_layout.xml
+++ b/src/main/res/layout/uploader_layout.xml
@@ -64,7 +64,7 @@
         android:padding="@dimen/standard_padding">
 
         <com.google.android.material.button.MaterialButton
-            android:theme="@style/OutlinedButton"
+            style="@style/OutlinedButton"
             android:id="@+id/uploader_cancel"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"