diff --git a/app/src/main/res/layout/base_item.xml b/app/src/main/res/layout/base_item.xml
index 0bea8d11..f701a1f8 100644
--- a/app/src/main/res/layout/base_item.xml
+++ b/app/src/main/res/layout/base_item.xml
@@ -31,7 +31,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:shapeAppearanceOverlay="@style/roundedImageView" />
+            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
 
         <TextView
             android:id="@+id/item_name"
diff --git a/app/src/main/res/layout/collection_item.xml b/app/src/main/res/layout/collection_item.xml
index ad5ba921..8a1a7dad 100644
--- a/app/src/main/res/layout/collection_item.xml
+++ b/app/src/main/res/layout/collection_item.xml
@@ -29,7 +29,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:shapeAppearanceOverlay="@style/roundedImageView" />
+            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
 
         <TextView
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/episode_bottom_sheet.xml b/app/src/main/res/layout/episode_bottom_sheet.xml
index 8d85647f..a7fc7396 100644
--- a/app/src/main/res/layout/episode_bottom_sheet.xml
+++ b/app/src/main/res/layout/episode_bottom_sheet.xml
@@ -39,7 +39,7 @@
             app:baseItemImage="@{viewModel.item}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/holder"
-            app:shapeAppearance="@style/roundedImageView" />
+            app:shapeAppearance="@style/ShapeAppearanceOverlay.Findroid.Image" />
 
         <FrameLayout
             android:id="@+id/missing_icon"
diff --git a/app/src/main/res/layout/episode_item.xml b/app/src/main/res/layout/episode_item.xml
index 9ed06be0..b6e96225 100644
--- a/app/src/main/res/layout/episode_item.xml
+++ b/app/src/main/res/layout/episode_item.xml
@@ -30,7 +30,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:shapeAppearanceOverlay="@style/roundedImageView" />
+            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
 
         <ImageView
             android:id="@+id/played_icon"
diff --git a/app/src/main/res/layout/fragment_add_server.xml b/app/src/main/res/layout/fragment_add_server.xml
index 1b38ed9e..9ce9a579 100644
--- a/app/src/main/res/layout/fragment_add_server.xml
+++ b/app/src/main/res/layout/fragment_add_server.xml
@@ -76,8 +76,8 @@
 
                 <Button
                     android:id="@+id/button_connect"
-                    style="@style/setup_button"
                     android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:drawableStart="@drawable/ic_launcher_foreground"
                     android:text="@string/button_connect" />
 
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 4ceee57c..1f1a7d7f 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -92,8 +92,8 @@
 
                 <Button
                     android:id="@+id/button_login"
-                    style="@style/setup_button"
                     android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:text="@string/button_login" />
 
                 <ProgressBar
diff --git a/app/src/main/res/layout/fragment_media_info.xml b/app/src/main/res/layout/fragment_media_info.xml
index c7a7b6d6..f92fecce 100644
--- a/app/src/main/res/layout/fragment_media_info.xml
+++ b/app/src/main/res/layout/fragment_media_info.xml
@@ -363,7 +363,7 @@
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent"
-                            app:shapeAppearance="@style/roundedImageView" />
+                            app:shapeAppearance="@style/ShapeAppearanceOverlay.Findroid.Image" />
 
                         <TextView
                             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/fragment_server_select.xml b/app/src/main/res/layout/fragment_server_select.xml
index 29f61f90..b79d2c45 100644
--- a/app/src/main/res/layout/fragment_server_select.xml
+++ b/app/src/main/res/layout/fragment_server_select.xml
@@ -68,7 +68,6 @@
 
         <Button
             android:id="@+id/button_add_server"
-            style="@style/setup_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
diff --git a/app/src/main/res/layout/home_episode_item.xml b/app/src/main/res/layout/home_episode_item.xml
index 84ba99ce..24213bfe 100644
--- a/app/src/main/res/layout/home_episode_item.xml
+++ b/app/src/main/res/layout/home_episode_item.xml
@@ -27,7 +27,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:shapeAppearanceOverlay="@style/roundedImageView" />
+            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
 
         <TextView
             android:id="@+id/primary_name"
diff --git a/app/src/main/res/layout/person_item.xml b/app/src/main/res/layout/person_item.xml
index 10850ae6..fb4e5612 100644
--- a/app/src/main/res/layout/person_item.xml
+++ b/app/src/main/res/layout/person_item.xml
@@ -25,7 +25,7 @@
             android:layout_marginBottom="4dp"
             android:scaleType="centerCrop"
             app:personImage="@{person}"
-            app:shapeAppearanceOverlay="@style/roundedImageView" />
+            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
 
         <TextView
             android:id="@+id/person_name"
diff --git a/app/src/main/res/layout/season_header.xml b/app/src/main/res/layout/season_header.xml
index 9fb32ac0..e25f2180 100644
--- a/app/src/main/res/layout/season_header.xml
+++ b/app/src/main/res/layout/season_header.xml
@@ -58,7 +58,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:seasonPoster="@{seasonId}"
-                app:shapeAppearanceOverlay="@style/roundedImageView" />
+                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
 
             <TextView
                 android:id="@+id/series_name"
diff --git a/app/src/main/res/values/shape.xml b/app/src/main/res/values/shape.xml
new file mode 100644
index 00000000..8481dc05
--- /dev/null
+++ b/app/src/main/res/values/shape.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="ShapeAppearance.Findroid.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
+        <item name="cornerSize">10dp</item>
+    </style>
+
+    <style name="ShapeAppearanceOverlay.Findroid.Image" parent="">
+        <item name="cornerSize">10dp</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e88792ac..b31d15c2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="setup_button">
-        <item name="android:layout_height">48dp</item>
-        <item name="android:background">@drawable/button_setup_background</item>
-    </style>
-
-    <style name="roundedImageView">
-        <item name="cornerFamily">rounded</item>
-        <item name="cornerSize">10dp</item>
-    </style>
-
     <style name="ErrorDialogStyle" parent="MaterialAlertDialog.MaterialComponents">
         <item name="materialAlertDialogBodyTextStyle">@style/AlertDialogBodyText</item>
     </style>
@@ -19,5 +9,4 @@
         <item name="android:fontFamily">monospace</item>
     </style>
 
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 45b24cff..87171b08 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -28,6 +28,9 @@
         <!-- Navigation bar -->
         <item name="android:navigationBarColor">?attr/colorSurface</item>
 
+        <!-- Shapes -->
+        <item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.Findroid.SmallComponent</item>
+
         <!-- Toolbar -->
         <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>
     </style>