diff --git a/app/src/main/java/org/tasks/activities/CalendarSelectionActivity.java b/app/src/main/java/org/tasks/activities/CalendarSelectionActivity.java
index 882fe616b..a308733f0 100644
--- a/app/src/main/java/org/tasks/activities/CalendarSelectionActivity.java
+++ b/app/src/main/java/org/tasks/activities/CalendarSelectionActivity.java
@@ -7,9 +7,9 @@ import android.os.Bundle;
 import androidx.fragment.app.FragmentManager;
 import org.tasks.calendars.AndroidCalendar;
 import org.tasks.injection.ActivityComponent;
-import org.tasks.injection.ThemedInjectingAppCompatActivity;
+import org.tasks.injection.InjectingAppCompatActivity;
 
-public class CalendarSelectionActivity extends ThemedInjectingAppCompatActivity
+public class CalendarSelectionActivity extends InjectingAppCompatActivity
     implements CalendarSelectionDialog.CalendarSelectionHandler {
 
   public static final String EXTRA_CALENDAR_ID = "extra_calendar_id";
diff --git a/app/src/main/java/org/tasks/activities/ColorPickerActivity.java b/app/src/main/java/org/tasks/activities/ColorPickerActivity.java
index 7b40d7311..bdf826b5b 100644
--- a/app/src/main/java/org/tasks/activities/ColorPickerActivity.java
+++ b/app/src/main/java/org/tasks/activities/ColorPickerActivity.java
@@ -10,12 +10,12 @@ import org.tasks.R;
 import org.tasks.billing.Inventory;
 import org.tasks.dialogs.ColorPickerDialog;
 import org.tasks.injection.ActivityComponent;
-import org.tasks.injection.ThemedInjectingAppCompatActivity;
+import org.tasks.injection.InjectingAppCompatActivity;
 import org.tasks.preferences.Preferences;
 import org.tasks.themes.Theme;
 import org.tasks.themes.ThemeCache;
 
-public class ColorPickerActivity extends ThemedInjectingAppCompatActivity
+public class ColorPickerActivity extends InjectingAppCompatActivity
     implements ColorPickerDialog.ThemePickerCallback {
 
   public static final String EXTRA_PALETTE = "extra_palette";
diff --git a/app/src/main/java/org/tasks/billing/PurchaseActivity.java b/app/src/main/java/org/tasks/billing/PurchaseActivity.java
index 2955fdea9..313bb445c 100644
--- a/app/src/main/java/org/tasks/billing/PurchaseActivity.java
+++ b/app/src/main/java/org/tasks/billing/PurchaseActivity.java
@@ -6,9 +6,9 @@ import android.os.Bundle;
 import androidx.fragment.app.FragmentManager;
 import javax.inject.Inject;
 import org.tasks.injection.ActivityComponent;
-import org.tasks.injection.ThemedInjectingAppCompatActivity;
+import org.tasks.injection.InjectingAppCompatActivity;
 
-public class PurchaseActivity extends ThemedInjectingAppCompatActivity {
+public class PurchaseActivity extends InjectingAppCompatActivity {
 
   private static final String FRAG_TAG_PURCHASE = "frag_tag_purchase";
 
diff --git a/app/src/main/res/layout/activity_attributions.xml b/app/src/main/res/layout/activity_attributions.xml
index f23e84543..974a2caa5 100644
--- a/app/src/main/res/layout/activity_attributions.xml
+++ b/app/src/main/res/layout/activity_attributions.xml
@@ -10,7 +10,7 @@
     android:id="@+id/list"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/asWindowBackground"
+    android:background="?android:attr/windowBackground"
     android:gravity="center"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/beast_mode_pref_activity.xml b/app/src/main/res/layout/beast_mode_pref_activity.xml
index 0072a507b..1ef56a09a 100644
--- a/app/src/main/res/layout/beast_mode_pref_activity.xml
+++ b/app/src/main/res/layout/beast_mode_pref_activity.xml
@@ -9,7 +9,6 @@
   <androidx.recyclerview.widget.RecyclerView
     android:id="@+id/recycler_view"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?asWindowBackground"/>
+    android:layout_height="match_parent"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_task_edit_empty.xml b/app/src/main/res/layout/fragment_task_edit_empty.xml
index d94877a52..278a47fc6 100644
--- a/app/src/main/res/layout/fragment_task_edit_empty.xml
+++ b/app/src/main/res/layout/fragment_task_edit_empty.xml
@@ -6,9 +6,4 @@
 
   <include layout="@layout/toolbar"/>
 
-  <FrameLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/asWindowBackground"/>
-
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/fragment_task_list.xml
index 1ef802082..b4a8c5105 100644
--- a/app/src/main/res/layout/fragment_task_list.xml
+++ b/app/src/main/res/layout/fragment_task_list.xml
@@ -23,7 +23,6 @@
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:background="?attr/asWindowBackground"
       android:elevation="@dimen/elevation_task_list"
       android:orientation="horizontal">
 
diff --git a/app/src/main/res/layout/task_list_body_empty.xml b/app/src/main/res/layout/task_list_body_empty.xml
index 0f821636e..badc817af 100644
--- a/app/src/main/res/layout/task_list_body_empty.xml
+++ b/app/src/main/res/layout/task_list_body_empty.xml
@@ -10,7 +10,6 @@
   <ScrollView
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="?attr/asWindowBackground"
     android:elevation="@dimen/elevation_task_list">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/task_list_body_standard.xml b/app/src/main/res/layout/task_list_body_standard.xml
index bdb7039da..0ad618a71 100644
--- a/app/src/main/res/layout/task_list_body_standard.xml
+++ b/app/src/main/res/layout/task_list_body_standard.xml
@@ -12,7 +12,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingBottom="@dimen/task_list_footer_height"
-    android:background="?attr/asWindowBackground"
     android:clipToPadding="false"
     android:elevation="@dimen/elevation_task_list"
     android:scrollbars="vertical"/>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index d183678e8..38d32fe3b 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -6,7 +6,6 @@
 <resources>
 
   <!-- theme attributes -->
-  <attr format="color" name="asWindowBackground"/>
   <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 8e496b5cc..8959d61c6 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -8,10 +8,9 @@
   <style name="DayNightAlert" parent="Theme.MaterialComponents.Light.Dialog.Alert" />
 
   <style name="TasksBase" parent="DayNight">
-    <item name="android:windowBackground">@null</item>
+    <item name="android:windowBackground">@color/window_background</item>
     <item name="android:colorBackground">@color/content_background</item>
     <item name="windowActionModeOverlay">true</item>
-    <item name="asWindowBackground">@color/window_background</item>
     <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
     <item name="dialogTheme">@style/TasksDialog</item>
     <item name="android:dialogTheme">@style/TasksDialog</item>
@@ -47,12 +46,12 @@
   </style>
 
   <style name="ThemeBlack" parent="Tasks">
-    <item name="asWindowBackground">@color/grey_900</item>
+    <item name="android:windowBackground">@color/grey_900</item>
     <item name="android:colorBackground">@android:color/black</item>
   </style>
 
   <style name="Wallpaper" parent="Tasks">
-    <item name="asWindowBackground">@color/black_38</item>
+    <item name="android:windowBackground">@color/black_38</item>
     <item name="android:colorBackground">@color/black_54</item>
     <item name="android:windowShowWallpaper">true</item>
     <item name="card_elevation">0dp</item>