diff --git a/app/src/main/java/org/tasks/files/MyFilePickerActivity.java b/app/src/main/java/org/tasks/files/MyFilePickerActivity.java
index 78929c04a..79780fc98 100644
--- a/app/src/main/java/org/tasks/files/MyFilePickerActivity.java
+++ b/app/src/main/java/org/tasks/files/MyFilePickerActivity.java
@@ -5,7 +5,6 @@ import static org.tasks.preferences.ResourceResolver.getData;
 import android.os.Bundle;
 import com.nononsenseapps.filepicker.FilePickerActivity;
 import javax.inject.Inject;
-import org.tasks.R;
 import org.tasks.injection.ActivityModule;
 import org.tasks.injection.InjectingApplication;
 import org.tasks.themes.Theme;
@@ -23,6 +22,5 @@ public class MyFilePickerActivity extends FilePickerActivity {
     theme.applyThemeAndStatusBarColor(this, getDelegate());
     setTitle(null);
     super.onCreate(savedInstanceState);
-    getWindow().getDecorView().setBackgroundColor(getData(this, R.attr.asContentBackground));
   }
 }
diff --git a/app/src/main/res/layout-v21/task_adapter_row_simple.xml b/app/src/main/res/layout-v21/task_adapter_row_simple.xml
index d3ee81b1e..9d3e386b4 100644
--- a/app/src/main/res/layout-v21/task_adapter_row_simple.xml
+++ b/app/src/main/res/layout-v21/task_adapter_row_simple.xml
@@ -9,7 +9,6 @@
   android:layout_width="fill_parent"
   android:layout_height="wrap_content"
   android:layout_marginBottom="1px"
-  app:cardBackgroundColor="?attr/asContentBackground"
   app:cardCornerRadius="0dp"
   app:cardElevation="?attr/card_elevation"
   app:cardPreventCornerOverlap="false">
diff --git a/app/src/main/res/layout/activity_caldav_account_settings.xml b/app/src/main/res/layout/activity_caldav_account_settings.xml
index db0f027ed..3a10277d1 100644
--- a/app/src/main/res/layout/activity_caldav_account_settings.xml
+++ b/app/src/main/res/layout/activity_caldav_account_settings.xml
@@ -4,7 +4,6 @@
   android:id="@+id/root_layout"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?attr/asContentBackground"
   android:orientation="vertical">
 
   <include layout="@layout/toolbar"/>
diff --git a/app/src/main/res/layout/activity_caldav_calendar_settings.xml b/app/src/main/res/layout/activity_caldav_calendar_settings.xml
index 196fd58e3..d83ab929d 100644
--- a/app/src/main/res/layout/activity_caldav_calendar_settings.xml
+++ b/app/src/main/res/layout/activity_caldav_calendar_settings.xml
@@ -3,7 +3,6 @@
   android:id="@+id/root_layout"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?attr/asContentBackground"
   android:descendantFocusability="beforeDescendants"
   android:focusableInTouchMode="true"
   android:orientation="vertical">
diff --git a/app/src/main/res/layout/activity_google_task_list_settings.xml b/app/src/main/res/layout/activity_google_task_list_settings.xml
index 5ef6bba9a..6d4d92156 100644
--- a/app/src/main/res/layout/activity_google_task_list_settings.xml
+++ b/app/src/main/res/layout/activity_google_task_list_settings.xml
@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?attr/asContentBackground"
   android:orientation="vertical">
 
   <include layout="@layout/toolbar"/>
diff --git a/app/src/main/res/layout/activity_prefs.xml b/app/src/main/res/layout/activity_prefs.xml
index 490ccadac..b3d517895 100644
--- a/app/src/main/res/layout/activity_prefs.xml
+++ b/app/src/main/res/layout/activity_prefs.xml
@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?attr/asContentBackground"
   android:orientation="vertical">
 
   <include layout="@layout/toolbar"/>
diff --git a/app/src/main/res/layout/activity_tag_settings.xml b/app/src/main/res/layout/activity_tag_settings.xml
index 18af5db82..2521c159e 100644
--- a/app/src/main/res/layout/activity_tag_settings.xml
+++ b/app/src/main/res/layout/activity_tag_settings.xml
@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?attr/asContentBackground"
   android:orientation="vertical">
 
   <include layout="@layout/toolbar"/>
diff --git a/app/src/main/res/layout/activity_tasker_create.xml b/app/src/main/res/layout/activity_tasker_create.xml
index 49087510c..62c3b238f 100644
--- a/app/src/main/res/layout/activity_tasker_create.xml
+++ b/app/src/main/res/layout/activity_tasker_create.xml
@@ -3,7 +3,6 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?attr/asContentBackground"
   android:orientation="vertical">
 
   <include layout="@layout/toolbar"/>
diff --git a/app/src/main/res/layout/custom_filter_activity.xml b/app/src/main/res/layout/custom_filter_activity.xml
index db3a9e831..c03323fb6 100644
--- a/app/src/main/res/layout/custom_filter_activity.xml
+++ b/app/src/main/res/layout/custom_filter_activity.xml
@@ -7,7 +7,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="fill_parent"
   android:layout_height="fill_parent"
-  android:background="?attr/asContentBackground"
   android:orientation="vertical">
 
   <include layout="@layout/toolbar"/>
diff --git a/app/src/main/res/layout/dialog_icon_picker.xml b/app/src/main/res/layout/dialog_icon_picker.xml
index b8d8d4a97..476b3a1c2 100644
--- a/app/src/main/res/layout/dialog_icon_picker.xml
+++ b/app/src/main/res/layout/dialog_icon_picker.xml
@@ -3,7 +3,6 @@
   android:layout_width="fill_parent"
   android:layout_height="fill_parent"
   android:orientation="vertical"
-  android:background="?attr/asContentBackground"
   android:padding="@dimen/keyline_first">
 
   <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/filter_settings_activity.xml b/app/src/main/res/layout/filter_settings_activity.xml
index bfdcacb1a..61c499a55 100644
--- a/app/src/main/res/layout/filter_settings_activity.xml
+++ b/app/src/main/res/layout/filter_settings_activity.xml
@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?attr/asContentBackground"
   android:orientation="vertical">
 
   <include layout="@layout/toolbar"/>
diff --git a/app/src/main/res/layout/fragment_task_edit.xml b/app/src/main/res/layout/fragment_task_edit.xml
index e015e47a7..55a49e6d7 100644
--- a/app/src/main/res/layout/fragment_task_edit.xml
+++ b/app/src/main/res/layout/fragment_task_edit.xml
@@ -15,7 +15,6 @@
     android:layout_width="fill_parent"
     android:layout_height="0dp"
     android:layout_weight="100"
-    android:background="?attr/asContentBackground"
     android:elevation="0dp"
     android:overScrollMode="never">
 
diff --git a/app/src/main/res/layout/preference_draggable_row.xml b/app/src/main/res/layout/preference_draggable_row.xml
index 7ed997d8a..acc489e58 100644
--- a/app/src/main/res/layout/preference_draggable_row.xml
+++ b/app/src/main/res/layout/preference_draggable_row.xml
@@ -7,7 +7,6 @@
   android:clickable="true"
   android:focusable="true"
   android:foreground="?selectableItemBackground"
-  app:cardBackgroundColor="?attr/asContentBackground"
   app:cardCornerRadius="2dp">
 
   <TextView
diff --git a/app/src/main/res/layout/task_adapter_row_body.xml b/app/src/main/res/layout/task_adapter_row_body.xml
index d821fb07d..990d13728 100644
--- a/app/src/main/res/layout/task_adapter_row_body.xml
+++ b/app/src/main/res/layout/task_adapter_row_body.xml
@@ -103,7 +103,7 @@
     android:layout_gravity="center_vertical|end"
     android:textColor="?android:textColorSecondary"
     android:visibility="gone"
-    app:chipBackgroundColor="?attr/asContentBackground"
+    app:chipBackgroundColor="?android:attr/colorBackground"
     app:chipIcon="@drawable/ic_outline_place_24px"
     app:chipIconTint="@color/icon_tint"
     app:chipStrokeColor="?android:textColorSecondary"
diff --git a/app/src/main/res/layout/task_adapter_row_simple.xml b/app/src/main/res/layout/task_adapter_row_simple.xml
index 47aaa7a8e..afb2423c3 100644
--- a/app/src/main/res/layout/task_adapter_row_simple.xml
+++ b/app/src/main/res/layout/task_adapter_row_simple.xml
@@ -3,7 +3,6 @@
   android:id="@+id/row"
   android:layout_width="fill_parent"
   android:layout_height="wrap_content"
-  android:background="?attr/asContentBackground"
   android:orientation="vertical">
 
   <include layout="@layout/task_adapter_row_body"/>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c5e4fa229..d183678e8 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -7,7 +7,6 @@
 
   <!-- theme attributes -->
   <attr format="color" name="asWindowBackground"/>
-  <attr format="color" name="asContentBackground"/>
   <attr format="reference" name="overlay_theme"/>
   <attr format="boolean" name="dark_status_bar"/>
   <attr format="dimension" name="card_elevation"/>
diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml
index 48f4bec3c..8e496b5cc 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -9,9 +9,9 @@
 
   <style name="TasksBase" parent="DayNight">
     <item name="android:windowBackground">@null</item>
+    <item name="android:colorBackground">@color/content_background</item>
     <item name="windowActionModeOverlay">true</item>
     <item name="asWindowBackground">@color/window_background</item>
-    <item name="asContentBackground">@color/content_background</item>
     <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
     <item name="dialogTheme">@style/TasksDialog</item>
     <item name="android:dialogTheme">@style/TasksDialog</item>
@@ -48,12 +48,12 @@
 
   <style name="ThemeBlack" parent="Tasks">
     <item name="asWindowBackground">@color/grey_900</item>
-    <item name="asContentBackground">@android:color/black</item>
+    <item name="android:colorBackground">@android:color/black</item>
   </style>
 
   <style name="Wallpaper" parent="Tasks">
     <item name="asWindowBackground">@color/black_38</item>
-    <item name="asContentBackground">@color/black_54</item>
+    <item name="android:colorBackground">@color/black_54</item>
     <item name="android:windowShowWallpaper">true</item>
     <item name="card_elevation">0dp</item>
   </style>