diff --git a/app/src/main/res/layout/activity_tag_picker.xml b/app/src/main/res/layout/activity_tag_picker.xml
index fc211d01d..b44a9a21b 100644
--- a/app/src/main/res/layout/activity_tag_picker.xml
+++ b/app/src/main/res/layout/activity_tag_picker.xml
@@ -37,7 +37,6 @@
   <androidx.recyclerview.widget.RecyclerView
     android:id="@+id/recycler_view"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:elevation="@dimen/elevation_task_list" />
+    android:layout_height="match_parent" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/control_set_subtasks.xml b/app/src/main/res/layout/control_set_subtasks.xml
index fa11eb9bc..1b1839480 100644
--- a/app/src/main/res/layout/control_set_subtasks.xml
+++ b/app/src/main/res/layout/control_set_subtasks.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout 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="wrap_content"
   android:gravity="center_vertical">
 
-
   <androidx.recyclerview.widget.RecyclerView
     android:id="@+id/recycler_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentTop="true"
     android:overScrollMode="never"
-    android:scrollbars="none"
-    app:elevation="@dimen/elevation_task_list" />
+    android:scrollbars="none" />
 
   <LinearLayout
     android:id="@+id/new_subtasks"
diff --git a/app/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/fragment_task_list.xml
index 2928856da..e633d8200 100644
--- a/app/src/main/res/layout/fragment_task_list.xml
+++ b/app/src/main/res/layout/fragment_task_list.xml
@@ -42,7 +42,6 @@
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:elevation="@dimen/elevation_task_list"
       android:orientation="horizontal">
 
       <FrameLayout
diff --git a/app/src/main/res/layout/task_adapter_row.xml b/app/src/main/res/layout/task_adapter_row.xml
index 29ec92601..b95edbb29 100644
--- a/app/src/main/res/layout/task_adapter_row.xml
+++ b/app/src/main/res/layout/task_adapter_row.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/row"
   android:layout_width="fill_parent"
-  android:layout_height="wrap_content"
-  android:layout_marginBottom="1px"
-  app:cardBackgroundColor="?android:colorBackground"
-  app:cardCornerRadius="0dp"
-  app:cardElevation="?attr/card_elevation"
-  app:cardPreventCornerOverlap="false">
+  android:background="?android:colorBackground"
+  android:layout_height="wrap_content">
 
     <RelativeLayout xmlns:tools="http://schemas.android.com/tools"
       android:id="@+id/rowBody"
@@ -100,4 +96,4 @@
       android:visibility="?attr/horizontal_divider_visibility"
       android:layout_gravity="bottom" />
 
-</com.google.android.material.card.MaterialCardView>
+</FrameLayout>
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 d9e1e2597..3a28bdf3b 100644
--- a/app/src/main/res/layout/task_list_body_empty.xml
+++ b/app/src/main/res/layout/task_list_body_empty.xml
@@ -10,8 +10,7 @@
 
   <ScrollView
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:elevation="@dimen/elevation_task_list">
+    android:layout_height="wrap_content">
 
     <LinearLayout
       android:layout_width="wrap_content"
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 0ad618a71..1dae21994 100644
--- a/app/src/main/res/layout/task_list_body_standard.xml
+++ b/app/src/main/res/layout/task_list_body_standard.xml
@@ -13,7 +13,6 @@
     android:layout_height="match_parent"
     android:paddingBottom="@dimen/task_list_footer_height"
     android:clipToPadding="false"
-    android:elevation="@dimen/elevation_task_list"
     android:scrollbars="vertical"/>
 
 </org.tasks.ui.DraggableSwipeRefreshLayout>
diff --git a/app/src/main/res/values-w820dp/styles.xml b/app/src/main/res/values-w820dp/styles.xml
index 4dc3add9f..db43bc852 100644
--- a/app/src/main/res/values-w820dp/styles.xml
+++ b/app/src/main/res/values-w820dp/styles.xml
@@ -5,6 +5,5 @@
     <item name="android:elevation" tools:ignore="NewApi">@dimen/elevation_refresh_indicator</item>
     <item name="android:clipToPadding">false</item>
     <item name="android:paddingStart">0dp</item>
-    <item name="android:paddingEnd">@dimen/elevation_padding</item>
   </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e7951670a..da7d1e560 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -18,9 +18,7 @@
 
   <dimen name="elevation_toolbar">8dp</dimen>
   <dimen name="elevation_app_bar">4dp</dimen>
-  <dimen name="elevation_task_list">2dp</dimen>
   <dimen name="elevation_refresh_indicator">3dp</dimen>
-  <dimen name="elevation_padding">3dp</dimen>
 
   <dimen name="widget_padding_compact">6dp</dimen>
   <dimen name="widget_padding">12dp</dimen>