diff --git a/app/src/main/res/layout/app_dialog.xml b/app/src/main/res/layout/app_dialog.xml
index 98a530f2..0039790a 100644
--- a/app/src/main/res/layout/app_dialog.xml
+++ b/app/src/main/res/layout/app_dialog.xml
@@ -14,7 +14,7 @@
         android:layout_height="150dp"
         android:contentDescription="@string/icon"
         android:focusable="false"
-        app:shapeAppearanceOverlay="@style/RoundedAppImage"
+        app:shapeAppearance="?attr/shapeAppearanceSmallComponent"
         tools:src="@drawable/default_icon" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/app_item_grid.xml b/app/src/main/res/layout/app_item_grid.xml
index 14b2ac03..ae042bb4 100644
--- a/app/src/main/res/layout/app_item_grid.xml
+++ b/app/src/main/res/layout/app_item_grid.xml
@@ -15,7 +15,7 @@
         android:layout_marginTop="10dp"
         android:layout_marginEnd="10dp"
         android:layout_marginBottom="10dp"
-        app:cardCornerRadius="16dp"
+        app:cardCornerRadius="@dimen/corner_radius_large"
         app:cardElevation="2dp">
 
         <ImageView
diff --git a/app/src/main/res/layout/app_item_grid_compact.xml b/app/src/main/res/layout/app_item_grid_compact.xml
index be07c006..b7bcc679 100644
--- a/app/src/main/res/layout/app_item_grid_compact.xml
+++ b/app/src/main/res/layout/app_item_grid_compact.xml
@@ -9,7 +9,7 @@
     android:layout_marginTop="10dp"
     android:layout_marginEnd="10dp"
     android:layout_marginBottom="10dp"
-    app:cardCornerRadius="16dp"
+    app:cardCornerRadius="@dimen/corner_radius_large"
     app:cardElevation="2dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/app_item_linear.xml b/app/src/main/res/layout/app_item_linear.xml
index 848a4efd..4d645c7d 100644
--- a/app/src/main/res/layout/app_item_linear.xml
+++ b/app/src/main/res/layout/app_item_linear.xml
@@ -18,7 +18,7 @@
         android:focusable="false"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:shapeAppearanceOverlay="@style/RoundedAppImage"
+        app:shapeAppearance="?attr/shapeAppearanceSmallComponent"
         tools:src="@drawable/default_icon" />
 
     <TextView
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index 65455a12..10141223 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -111,7 +111,7 @@
                     android:layout_marginStart="10dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginEnd="10dp"
-                    app:cardCornerRadius="16dp"
+                    app:cardCornerRadius="@dimen/corner_radius_large"
                     app:cardElevation="2dp"
                     app:layout_constraintTop_toBottomOf="@id/sub_text" />
             </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 247fbb1a..6929ead2 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="grid_padding">8dp</dimen>
-    <dimen name="corner_radius">8dp</dimen>
+    <dimen name="corner_radius">6dp</dimen>
+    <dimen name="corner_radius_large">12dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c7c9f300..8c3774d1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,11 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="RoundedAppImage">
+    <style name="ShapeAppearance.App.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
         <item name="cornerFamily">rounded</item>
         <item name="cornerSize">@dimen/corner_radius</item>
     </style>
 
+    <style name="ShapeAppearance.App.MediumComponent" parent="ShapeAppearance.MaterialComponents.MediumComponent">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">@dimen/corner_radius</item>
+    </style>
+
+    <!-- android:elevation makes BottomSheetDialog background color brighter than it should be -->
+    <style name="ThemeOverlay.App.BottomSheetDialog" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/Widget.App.BottomSheet</item>
+    </style>
+
+    <style name="Widget.App.BottomSheet" parent="Widget.MaterialComponents.BottomSheet.Modal">
+        <item name="android:elevation">@null</item>
+        <item name="shapeAppearanceOverlay">@style/ShapeAppearance.App.BottomSheetDialog</item>
+    </style>
+
+    <style name="ShapeAppearance.App.BottomSheetDialog" parent="">
+        <item name="cornerSizeTopLeft">@dimen/corner_radius_large</item>
+        <item name="cornerSizeTopRight">@dimen/corner_radius_large</item>
+    </style>
+
+    <!-- Workaround for AndroidX Preference as it doesn't use MaterialAlertDialogBuilder -->
+    <style name="ThemeOverlay.App.MaterialAlertDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
+        <item name="android:dialogCornerRadius">@dimen/corner_radius</item>
+    </style>
+
     <style name="ChipChoice" parent="Widget.MaterialComponents.Chip.Choice">
         <item name="android:textAllCaps">true</item>
         <item name="chipStartPadding">8dp</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 3710a2d1..4fecb087 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -15,8 +15,11 @@
 
         <item name="chipChoiceStyle">@style/ChipChoice</item>
 
-        <item name="alertDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog</item>
-        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.MaterialComponents.BottomSheetDialog</item>
+        <item name="alertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog</item>
+        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialog</item>
+
+        <item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.App.SmallComponent</item>
+        <item name="shapeAppearanceMediumComponent">@style/ShapeAppearance.App.MediumComponent</item>
     </style>
 
     <style name="AppTheme" parent="BaseAppTheme">