diff --git a/app/src/main/res/drawable-v21/bg_appbar.xml b/app/src/main/res/drawable-v21/bg_appbar.xml
deleted file mode 100644
index 264dc253c..000000000
--- a/app/src/main/res/drawable-v21/bg_appbar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="?colorSurfaceVariant" />
-        </shape>
-    </item>
-
-    <item android:bottom="2dp">
-        <shape android:shape="rectangle">
-            <solid android:color="?colorSurface" />
-        </shape>
-    </item>
-
-</layer-list>
diff --git a/app/src/main/res/drawable-v21/bg_divider_rounded_on_primary.xml b/app/src/main/res/drawable-v21/bg_divider_rounded_on_primary.xml
deleted file mode 100644
index 783719e7d..000000000
--- a/app/src/main/res/drawable-v21/bg_divider_rounded_on_primary.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size android:height="4dp" />
-    <corners android:radius="2dp" />
-    <solid android:color="?colorOnPrimary" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/bg_shadow.xml b/app/src/main/res/drawable-v21/bg_shadow.xml
deleted file mode 100644
index 4f7bd989b..000000000
--- a/app/src/main/res/drawable-v21/bg_shadow.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:angle="270"
-        android:endColor="?colorSurfaceVariant"
-        android:startColor="@android:color/transparent" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/fast_scroll_thumb.xml b/app/src/main/res/drawable-v21/fast_scroll_thumb.xml
deleted file mode 100644
index 19c3590fa..000000000
--- a/app/src/main/res/drawable-v21/fast_scroll_thumb.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <corners android:radius="@dimen/r1" />
-            <solid android:color="?colorOnSurfaceVariant" />
-            <size android:width="5dp" android:height="5dp" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:radius="@dimen/r1" />
-            <solid android:color="?colorOnSurfaceVariant" />
-            <size android:width="5dp" android:height="5dp" />
-        </shape>
-    </item>
-
-</selector>
diff --git a/app/src/main/res/drawable-v21/progress_determinate.xml b/app/src/main/res/drawable-v21/progress_determinate.xml
deleted file mode 100644
index 95b275b5d..000000000
--- a/app/src/main/res/drawable-v21/progress_determinate.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@android:id/background">
-        <shape>
-            <solid android:color="@android:color/transparent" />
-        </shape>
-    </item>
-
-    <item android:id="@android:id/secondaryProgress">
-        <clip>
-            <shape>
-                <solid android:color="?colorSecondary" />
-            </shape>
-        </clip>
-    </item>
-
-    <item android:id="@android:id/progress">
-        <clip>
-            <shape>
-                <solid android:color="?colorPrimary" />
-            </shape>
-        </clip>
-    </item>
-
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_appbar.xml b/app/src/main/res/drawable/bg_appbar.xml
deleted file mode 100644
index 9e8232951..000000000
--- a/app/src/main/res/drawable/bg_appbar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/defColorSurfaceVariant" />
-        </shape>
-    </item>
-
-    <item android:bottom="2dp">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/defColorSurface" />
-        </shape>
-    </item>
-
-</layer-list>
diff --git a/app/src/main/res/drawable/bg_divider_rounded_on_primary.xml b/app/src/main/res/drawable/bg_divider_rounded_on_primary.xml
index a33cc5fee..bd7ef518c 100644
--- a/app/src/main/res/drawable/bg_divider_rounded_on_primary.xml
+++ b/app/src/main/res/drawable/bg_divider_rounded_on_primary.xml
@@ -3,5 +3,5 @@
     android:shape="rectangle">
     <size android:height="4dp" />
     <corners android:radius="2dp" />
-    <solid android:color="@color/defColorOnPrimary" />
+    <solid android:color="@android:color/black" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_shadow.xml b/app/src/main/res/drawable/bg_shadow.xml
index 5d6c86bcf..aacfce136 100644
--- a/app/src/main/res/drawable/bg_shadow.xml
+++ b/app/src/main/res/drawable/bg_shadow.xml
@@ -3,6 +3,6 @@
     android:shape="rectangle">
     <gradient
         android:angle="270"
-        android:endColor="@color/defColorSurfaceVariant"
+        android:endColor="@android:color/black"
         android:startColor="@android:color/transparent" />
 </shape>
diff --git a/app/src/main/res/drawable/fast_scroll_thumb.xml b/app/src/main/res/drawable/fast_scroll_thumb.xml
deleted file mode 100644
index f0ae9cd31..000000000
--- a/app/src/main/res/drawable/fast_scroll_thumb.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <corners android:radius="@dimen/r1" />
-            <solid android:color="@color/defColorOnSurfaceVariant" />
-            <size android:width="5dp" android:height="5dp" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:radius="@dimen/r1" />
-            <solid android:color="@color/defColorOnSurfaceVariant" />
-            <size android:width="5dp" android:height="5dp" />
-        </shape>
-    </item>
-
-</selector>
diff --git a/app/src/main/res/drawable/fast_scroll_track.xml b/app/src/main/res/drawable/fast_scroll_track.xml
deleted file mode 100644
index c8b91c814..000000000
--- a/app/src/main/res/drawable/fast_scroll_track.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/transparent" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/transparent" />
-        </shape>
-    </item>
-
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/progress_determinate.xml b/app/src/main/res/drawable/progress_determinate.xml
deleted file mode 100644
index c50466498..000000000
--- a/app/src/main/res/drawable/progress_determinate.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@android:id/background">
-        <shape>
-            <solid android:color="@android:color/transparent" />
-        </shape>
-    </item>
-
-    <item android:id="@android:id/secondaryProgress">
-        <clip>
-            <shape>
-                <solid android:color="@color/defColorSecondary" />
-            </shape>
-        </clip>
-    </item>
-
-    <item android:id="@android:id/progress">
-        <clip>
-            <shape>
-                <solid android:color="@color/defColorPrimary" />
-            </shape>
-        </clip>
-    </item>
-
-</layer-list>
diff --git a/app/src/main/res/layout/activity_main_md2.xml b/app/src/main/res/layout/activity_main_md2.xml
index 2867a9407..09c2c0f8e 100644
--- a/app/src/main/res/layout/activity_main_md2.xml
+++ b/app/src/main/res/layout/activity_main_md2.xml
@@ -43,6 +43,12 @@
                 tools:layout_marginTop="24dp"
                 tools:title="Home" />
 
+            <View
+                gone="@{android.os.Build.VERSION.SDK_INT >= 21}"
+                android:layout_width="match_parent"
+                android:layout_height="2dp"
+                android:background="?colorSurfaceVariant"/>
+
         </com.google.android.material.appbar.AppBarLayout>
 
         <!--
diff --git a/app/src/main/res/layout/fragment_safetynet_md2.xml b/app/src/main/res/layout/fragment_safetynet_md2.xml
index 62e402193..238a4ca27 100644
--- a/app/src/main/res/layout/fragment_safetynet_md2.xml
+++ b/app/src/main/res/layout/fragment_safetynet_md2.xml
@@ -87,12 +87,13 @@
                             app:layout_constraintTop_toTopOf="parent"
                             tools:text="@string/safetynet_attest_success" />
 
-                        <View
+                        <ImageView
                             android:id="@+id/safetynet_divider"
                             android:layout_width="50dp"
                             android:layout_height="4dp"
                             android:layout_marginTop="@dimen/l2"
-                            android:background="@drawable/bg_divider_rounded_on_primary"
+                            app:srcCompat="@drawable/bg_divider_rounded_on_primary"
+                            app:tint="?colorOnPrimary"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/safetynet_title" />
diff --git a/app/src/main/res/layout/include_module_filter.xml b/app/src/main/res/layout/include_module_filter.xml
index 800c2511d..3feff1d5e 100644
--- a/app/src/main/res/layout/include_module_filter.xml
+++ b/app/src/main/res/layout/include_module_filter.xml
@@ -35,11 +35,6 @@
             android:orientation="vertical"
             android:paddingStart="@dimen/l1"
             android:paddingTop="@{viewModel.insets.top + (int) @dimen/internal_action_bar_size + (int) @dimen/l1}"
-            app:fastScrollEnabled="true"
-            app:fastScrollHorizontalThumbDrawable="@drawable/fast_scroll_thumb"
-            app:fastScrollHorizontalTrackDrawable="@drawable/fast_scroll_track"
-            app:fastScrollVerticalThumbDrawable="@drawable/fast_scroll_thumb"
-            app:fastScrollVerticalTrackDrawable="@drawable/fast_scroll_track"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constrainedHeight="true"
             app:layout_constraintBottom_toTopOf="@+id/module_filter_title_search"
@@ -48,10 +43,11 @@
             app:spanCount="2"
             tools:listitem="@layout/item_repo_md2" />
 
-        <View
+        <ImageView
             android:layout_width="match_parent"
             android:layout_height="@dimen/l_50"
-            android:background="@drawable/bg_shadow"
+            app:srcCompat="@drawable/bg_shadow"
+            app:tint="?colorSurfaceVariant"
             app:layout_constraintBottom_toBottomOf="@+id/module_filter_list" />
 
         <TextView
diff --git a/app/src/main/res/layout/item_hide_md2.xml b/app/src/main/res/layout/item_hide_md2.xml
index 6904eeaf3..44aef96fb 100644
--- a/app/src/main/res/layout/item_hide_md2.xml
+++ b/app/src/main/res/layout/item_hide_md2.xml
@@ -107,6 +107,7 @@
             style="@style/WidgetFoundation.ProgressBar"
             android:layout_width="match_parent"
             android:layout_gravity="top"
+            gone="@{item.checkedPercent == 0}"
             android:progress="@{item.checkedPercent}" />
 
     </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/values/styles_md2_impl.xml b/app/src/main/res/values/styles_md2_impl.xml
index b2aadfac3..0fb5c3661 100644
--- a/app/src/main/res/values/styles_md2_impl.xml
+++ b/app/src/main/res/values/styles_md2_impl.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="WidgetFoundation.Appbar" parent="Widget.MaterialComponents.AppBarLayout.Surface">
-        <item name="elevation">0dp</item>
-        <item name="android:background">@drawable/bg_appbar</item>
-    </style>
+    <style name="WidgetFoundation.Appbar" parent="Widget.MaterialComponents.AppBarLayout.Surface" />
 
     <style name="WidgetFoundation.Toolbar" parent="Widget.MaterialComponents.Toolbar.Surface">
         <item name="titleTextAppearance">@style/AppearanceFoundation.Title</item>
@@ -169,7 +166,6 @@
     <style name="WidgetFoundation.ProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal">
         <item name="android:indeterminate">false</item>
         <item name="android:layout_height">4dp</item>
-        <item name="android:progressDrawable">@drawable/progress_determinate</item>
     </style>
 
     <style name="WidgetFoundation.ProgressBar.Indeterminate" parent="Widget.AppCompat.ProgressBar.Horizontal">