diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
index 97b93c2e..7b456a38 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
@@ -61,7 +61,6 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.CategoryInfo
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.RetroUtil
-import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.bottomsheet.BottomSheetBehavior.*
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt
index c363f8b4..08ddbbe1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt
@@ -14,7 +14,6 @@
  */
 package code.name.monkey.retromusic.dialogs
 
-import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
@@ -42,7 +41,6 @@ import java.io.IOException
 
 class SongDetailDialog : DialogFragment() {
 
-    @SuppressLint("InflateParams")
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val context: Context = requireContext()
         val dialogView = LayoutInflater.from(context).inflate(R.layout.dialog_file_details, null)
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt
index d82b51e7..c667b2fb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt
@@ -84,7 +84,6 @@ abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : Recycle
                     onShuffleClicked()
                 }
                 accentColor()
-                hide()
             }
         } else {
             binding.shuffleButton.isVisible = false
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt
index 2615b1f7..e3ebe33f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt
@@ -53,7 +53,6 @@ import com.bumptech.glide.request.target.Target
 import com.github.dhaval2404.imagepicker.ImagePicker
 import com.github.dhaval2404.imagepicker.constant.ImageProvider
 import com.google.android.material.transition.MaterialContainerTransform
-import com.google.android.material.transition.MaterialSharedAxis
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/app/src/main/res/drawable-v31/rect_selector.xml b/app/src/main/res/drawable-v31/rect_selector.xml
index 760b218b..31422ac9 100644
--- a/app/src/main/res/drawable-v31/rect_selector.xml
+++ b/app/src/main/res/drawable-v31/rect_selector.xml
@@ -17,7 +17,7 @@
 
     <item android:id="@android:id/mask">
         <shape>
-            <corners android:radius="8dp" />
+            <corners android:radius="@dimen/m3_card_corner_radius" />
             <solid android:color="@color/md_green_500" />
         </shape>
     </item>
@@ -25,7 +25,7 @@
         <selector>
             <item android:state_activated="true">
                 <shape>
-                    <corners android:radius="8dp" />
+                    <corners android:radius="@dimen/m3_card_corner_radius" />
                     <solid android:color="@android:color/system_neutral1_300" />
                 </shape>
             </item>
diff --git a/app/src/main/res/drawable/rect_selector.xml b/app/src/main/res/drawable/rect_selector.xml
index b4770919..35a2089f 100644
--- a/app/src/main/res/drawable/rect_selector.xml
+++ b/app/src/main/res/drawable/rect_selector.xml
@@ -17,7 +17,7 @@
 
     <item android:id="@android:id/mask">
         <shape>
-            <corners android:radius="8dp" />
+            <corners android:radius="@dimen/m3_card_corner_radius" />
             <solid android:color="@color/md_green_500" />
         </shape>
     </item>
@@ -25,7 +25,7 @@
         <selector>
             <item android:state_activated="true">
                 <shape>
-                    <corners android:radius="8dp" />
+                    <corners android:radius="@dimen/m3_card_corner_radius" />
                     <solid android:color="?android:attr/colorControlHighlight" />
                 </shape>
             </item>
diff --git a/app/src/main/res/layout-land/fragment_album_details.xml b/app/src/main/res/layout-land/fragment_album_details.xml
index c43b9589..4639f9b0 100644
--- a/app/src/main/res/layout-land/fragment_album_details.xml
+++ b/app/src/main/res/layout-land/fragment_album_details.xml
@@ -8,7 +8,8 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:transitionName="@string/transition_album_art"
-    tools:ignore="UnusedAttribute">
+    tools:ignore="UnusedAttribute"
+    android:transitionGroup="true">
 
     <FrameLayout
         android:id="@+id/toolbar_container"
@@ -31,7 +32,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="@dimen/mini_player_height"
-        app:cardCornerRadius="24dp"
+        app:cardCornerRadius="@dimen/m3_card_large_radius"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-land/fragment_artist_details.xml b/app/src/main/res/layout-land/fragment_artist_details.xml
index 525e3c1b..680843ef 100644
--- a/app/src/main/res/layout-land/fragment_artist_details.xml
+++ b/app/src/main/res/layout-land/fragment_artist_details.xml
@@ -32,7 +32,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginBottom="@dimen/mini_player_height"
         android:transitionName="@string/transition_artist_image"
-        app:cardCornerRadius="24dp"
+        app:cardCornerRadius="@dimen/m3_card_large_radius"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml
index 600e4b02..e418b247 100755
--- a/app/src/main/res/layout/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout/activity_album_tag_editor.xml
@@ -40,7 +40,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="16dp"
                 android:transitionName="@string/transition_album_art"
-                app:cardCornerRadius="24dp"
+                app:cardCornerRadius="@dimen/m3_card_large_radius"
                 app:cardElevation="8dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_album_card_cover.xml b/app/src/main/res/layout/fragment_album_card_cover.xml
index 4d2b14ea..bc7bd97c 100644
--- a/app/src/main/res/layout/fragment_album_card_cover.xml
+++ b/app/src/main/res/layout/fragment_album_card_cover.xml
@@ -12,7 +12,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
-        app:cardCornerRadius="12dp"
+        app:cardCornerRadius="@dimen/m3_card_medium_radius"
         app:cardElevation="4dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_album_circle_cover.xml b/app/src/main/res/layout/fragment_album_circle_cover.xml
index ce28ec7c..ad1d28b4 100644
--- a/app/src/main/res/layout/fragment_album_circle_cover.xml
+++ b/app/src/main/res/layout/fragment_album_circle_cover.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:padding="@dimen/padding_album_cover">
 
     <code.name.monkey.retromusic.views.CircularImageView
         android:id="@+id/player_image"
diff --git a/app/src/main/res/layout/fragment_album_cover.xml b/app/src/main/res/layout/fragment_album_cover.xml
index 1056385a..6ed22584 100644
--- a/app/src/main/res/layout/fragment_album_cover.xml
+++ b/app/src/main/res/layout/fragment_album_cover.xml
@@ -8,7 +8,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="@dimen/m3_card_corner_radius"
         app:cardElevation="8dp"
         app:cardUseCompatPadding="true"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fragment_album_details.xml b/app/src/main/res/layout/fragment_album_details.xml
index 2f0f9a35..fc9654cb 100644
--- a/app/src/main/res/layout/fragment_album_details.xml
+++ b/app/src/main/res/layout/fragment_album_details.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    android:transitionGroup="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
@@ -47,7 +48,7 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginEnd="16dp"
-                app:cardCornerRadius="24dp"
+                app:cardCornerRadius="@dimen/m3_card_large_radius"
                 app:layout_constraintDimensionRatio="1:1"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_album_flat_cover.xml b/app/src/main/res/layout/fragment_album_flat_cover.xml
index 58e570a6..c0125a0d 100644
--- a/app/src/main/res/layout/fragment_album_flat_cover.xml
+++ b/app/src/main/res/layout/fragment_album_flat_cover.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:padding="@dimen/padding_album_cover">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/player_image"
diff --git a/app/src/main/res/layout/fragment_album_full_card_cover.xml b/app/src/main/res/layout/fragment_album_full_card_cover.xml
index d0052e21..438b762b 100644
--- a/app/src/main/res/layout/fragment_album_full_card_cover.xml
+++ b/app/src/main/res/layout/fragment_album_full_card_cover.xml
@@ -9,7 +9,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_margin="16dp"
-        app:cardCornerRadius="16dp"
+        app:cardCornerRadius="@dimen/m3_card_medium_radius"
         app:cardElevation="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_album_material_cover.xml b/app/src/main/res/layout/fragment_album_material_cover.xml
index dc15017f..511522b3 100644
--- a/app/src/main/res/layout/fragment_album_material_cover.xml
+++ b/app/src/main/res/layout/fragment_album_material_cover.xml
@@ -9,7 +9,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_margin="16dp"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="@dimen/m3_card_corner_radius"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_artist_details.xml b/app/src/main/res/layout/fragment_artist_details.xml
index f025c03d..608be2c8 100644
--- a/app/src/main/res/layout/fragment_artist_details.xml
+++ b/app/src/main/res/layout/fragment_artist_details.xml
@@ -46,7 +46,7 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginEnd="16dp"
-                app:cardCornerRadius="24dp"
+                app:cardCornerRadius="@dimen/m3_card_large_radius"
                 app:layout_constraintDimensionRatio="1:1"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_album_card.xml b/app/src/main/res/layout/item_album_card.xml
index a1d69663..7b1b4cd8 100644
--- a/app/src/main/res/layout/item_album_card.xml
+++ b/app/src/main/res/layout/item_album_card.xml
@@ -9,7 +9,7 @@
     android:background="?attr/rectSelector"
     android:orientation="vertical"
     android:padding="4dp"
-    app:cardCornerRadius="12dp"
+    app:cardCornerRadius="@dimen/m3_card_corner_radius"
     app:layout_constraintDimensionRatio="3:4"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_artist_card.xml b/app/src/main/res/layout/item_artist_card.xml
index f0558b04..dc7bf38e 100644
--- a/app/src/main/res/layout/item_artist_card.xml
+++ b/app/src/main/res/layout/item_artist_card.xml
@@ -17,7 +17,7 @@
     android:layout_width="128dp"
     android:layout_height="128dp"
     android:layout_margin="4dp"
-    app:cardCornerRadius="16dp">
+    app:cardCornerRadius="@dimen/m3_card_corner_radius">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/paletteColorContainer"
diff --git a/app/src/main/res/layout/item_artist_square.xml b/app/src/main/res/layout/item_artist_square.xml
index 3b348c3f..26525f09 100644
--- a/app/src/main/res/layout/item_artist_square.xml
+++ b/app/src/main/res/layout/item_artist_square.xml
@@ -7,7 +7,7 @@
     android:layout_height="wrap_content"
     android:layout_margin="8dp"
     android:background="?attr/rectSelector"
-    app:cardCornerRadius="8dp">
+    app:cardCornerRadius="@dimen/m3_card_corner_radius">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/item_card.xml b/app/src/main/res/layout/item_card.xml
index f2974aab..dd6bf1a5 100644
--- a/app/src/main/res/layout/item_card.xml
+++ b/app/src/main/res/layout/item_card.xml
@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="@dimen/m3_card_corner_radius"
         tools:ignore="MissingPrefix">
 
         <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/item_card_color.xml b/app/src/main/res/layout/item_card_color.xml
index 908fe636..a7c240da 100644
--- a/app/src/main/res/layout/item_card_color.xml
+++ b/app/src/main/res/layout/item_card_color.xml
@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="@dimen/m3_card_corner_radius"
         tools:ignore="MissingPrefix">
 
         <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/item_genre.xml b/app/src/main/res/layout/item_genre.xml
index 620042ef..2659cda3 100644
--- a/app/src/main/res/layout/item_genre.xml
+++ b/app/src/main/res/layout/item_genre.xml
@@ -14,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
-        app:cardCornerRadius="8dp">
+        app:cardCornerRadius="@dimen/m3_card_corner_radius">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml
index 4440a526..e5a5f5e4 100644
--- a/app/src/main/res/layout/item_grid.xml
+++ b/app/src/main/res/layout/item_grid.xml
@@ -17,7 +17,7 @@
         android:layout_height="0dp"
         android:scaleType="centerCrop"
         app:cardBackgroundColor="@color/transparent"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="@dimen/m3_card_corner_radius"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_image.xml b/app/src/main/res/layout/item_image.xml
index 76c2a466..e6cbd121 100644
--- a/app/src/main/res/layout/item_image.xml
+++ b/app/src/main/res/layout/item_image.xml
@@ -14,7 +14,7 @@
         android:layout_margin="8dp"
         android:orientation="vertical"
         app:cardBackgroundColor="@color/transparent"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="@dimen/m3_card_corner_radius"
         app:cardPreventCornerOverlap="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_image_gradient.xml b/app/src/main/res/layout/item_image_gradient.xml
index eb195139..309cea05 100644
--- a/app/src/main/res/layout/item_image_gradient.xml
+++ b/app/src/main/res/layout/item_image_gradient.xml
@@ -15,7 +15,7 @@
         android:layout_height="0dp"
         android:layout_margin="4dp"
         android:orientation="vertical"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="@dimen/m3_card_corner_radius"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
index ae2a0a2e..55df9fda 100755
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     android:layout_marginStart="1dp"
     android:layout_marginEnd="1dp"
-    android:layout_marginBottom="1dp"
     android:background="?rectSelector"
+    android:layout_marginVertical="2dp"
     android:clickable="true"
     android:focusable="true"
     android:minHeight="?attr/listPreferredItemHeight"
@@ -35,15 +35,15 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="16dp"
-        app:cardCornerRadius="6dp"
+        app:cardCornerRadius="10dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@id/drag_view"
         app:layout_constraintTop_toTopOf="parent">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/image"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
             android:scaleType="centerCrop"
@@ -63,7 +63,6 @@
             tools:visibility="visible" />
     </com.google.android.material.card.MaterialCardView>
 
-
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/item_suggestions.xml b/app/src/main/res/layout/item_suggestions.xml
index bd3d115e..49e55485 100644
--- a/app/src/main/res/layout/item_suggestions.xml
+++ b/app/src/main/res/layout/item_suggestions.xml
@@ -24,7 +24,7 @@
         android:id="@+id/card1"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="@dimen/m3_card_corner_radius"
         app:cardUseCompatPadding="true"
         app:layout_constraintDimensionRatio="1,1"
         app:layout_constraintEnd_toStartOf="@id/card2"
@@ -44,7 +44,7 @@
         android:id="@+id/card2"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="@dimen/m3_card_corner_radius"
         app:cardUseCompatPadding="true"
         app:layout_constraintDimensionRatio="1,1"
         app:layout_constraintEnd_toStartOf="@id/card3"
@@ -64,7 +64,7 @@
         android:id="@+id/card3"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="@dimen/m3_card_corner_radius"
         app:cardUseCompatPadding="true"
         app:layout_constraintDimensionRatio="1,1"
         app:layout_constraintEnd_toStartOf="@id/card4"
@@ -84,7 +84,7 @@
         android:id="@+id/card4"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="@dimen/m3_card_corner_radius"
         app:cardUseCompatPadding="true"
         app:layout_constraintDimensionRatio="1,1"
         app:layout_constraintEnd_toStartOf="@id/card5"
@@ -104,7 +104,7 @@
         android:id="@+id/card5"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="@dimen/m3_card_corner_radius"
         app:cardUseCompatPadding="true"
         app:layout_constraintDimensionRatio="1,1"
         app:layout_constraintEnd_toEndOf="parent"
@@ -127,7 +127,7 @@
         android:clickable="true"
         android:focusable="true"
         app:cardBackgroundColor="?attr/colorSurface"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="@dimen/m3_card_corner_radius"
         app:cardElevation="0dp"
         app:cardUseCompatPadding="true"
         app:layout_constraintDimensionRatio="1,1"
@@ -155,7 +155,7 @@
         android:id="@+id/card7"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="@dimen/m3_card_corner_radius"
         app:cardUseCompatPadding="true"
         app:layout_constraintDimensionRatio="1,1"
         app:layout_constraintEnd_toStartOf="@id/card8"
@@ -175,7 +175,7 @@
         android:id="@+id/card8"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="@dimen/m3_card_corner_radius"
         app:cardUseCompatPadding="true"
         app:layout_constraintDimensionRatio="1,1"
         app:layout_constraintEnd_toEndOf="parent"
@@ -194,7 +194,7 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="@dimen/m3_card_corner_radius"
         app:cardUseCompatPadding="true"
         app:layout_constraintDimensionRatio="1,1"
         app:layout_constraintEnd_toStartOf="@id/card8"
diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml
index 958c1fb4..4666e03d 100644
--- a/app/src/main/res/values-night-v27/styles.xml
+++ b/app/src/main/res/values-night-v27/styles.xml
@@ -35,5 +35,6 @@
             @style/Widget.MaterialComponents.FloatingActionButton
         </item>
         <item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
+        <item name="popupMenuBackground">@drawable/popup_background</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 424eb2c9..7ab94a34 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -12,7 +12,7 @@
   ~ See the GNU General Public License for more details.
   -->
 
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="md_background_color">?attr/colorSurface</item>
@@ -33,5 +33,6 @@
         <item name="floatingActionButtonStyle">
             @style/Widget.MaterialComponents.FloatingActionButton
         </item>
+        <item name="popupMenuBackground">@drawable/popup_background</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/styles_parents.xml b/app/src/main/res/values-v27/styles_parents.xml
index 1a85dbf2..2aea8a24 100644
--- a/app/src/main/res/values-v27/styles_parents.xml
+++ b/app/src/main/res/values-v27/styles_parents.xml
@@ -33,6 +33,7 @@
             @style/Widget.MaterialComponents.FloatingActionButton
         </item>
         <item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
+        <item name="popupMenuBackground">@drawable/popup_background</item>
     </style>
 
     <style name="Theme.RetroMusic.Base" parent="Theme.Material3.DayNight.NoActionBar">
@@ -59,6 +60,7 @@
             @style/Widget.MaterialComponents.FloatingActionButton
         </item>
         <item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
+        <item name="popupMenuBackground">@drawable/popup_background</item>
     </style>
 
     <style name="Theme.RetroMusic.Base.Light" parent="Theme.Material3.Light.NoActionBar">
@@ -82,5 +84,6 @@
             @style/Widget.MaterialComponents.FloatingActionButton
         </item>
         <item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
+        <item name="popupMenuBackground">@drawable/popup_background</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/styles.xml b/app/src/main/res/values-v31/styles.xml
index fd8619d1..f8479c49 100644
--- a/app/src/main/res/values-v31/styles.xml
+++ b/app/src/main/res/values-v31/styles.xml
@@ -8,6 +8,7 @@
         <item name="android:statusBarColor">@color/transparent</item>
         <item name="android:navigationBarColor">@color/transparent</item>
         <item name="android:enforceNavigationBarContrast">false</item>
+        <item name="popupMenuBackground">@drawable/popup_background</item>
     </style>
 
     <style name="BottomSheetStyle" parent="Widget.Material3.BottomSheet">
diff --git a/app/src/main/res/values-xlarge/dimens.xml b/app/src/main/res/values-xlarge/dimens.xml
index b6e544b5..a7ffbf07 100644
--- a/app/src/main/res/values-xlarge/dimens.xml
+++ b/app/src/main/res/values-xlarge/dimens.xml
@@ -1,7 +1,7 @@
 <resources>
     <dimen name="toolbar_margin_horizontal">64dp</dimen>
     <dimen name="toolbar_height">64dp</dimen>
-    <dimen name="item_song_height">64dp</dimen>
+    <dimen name="item_song_height">72dp</dimen>
     <dimen name="button_padding_vertical">16dp</dimen>
     <dimen name="pref_title_padding">80dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index b44662d3..59cbf640 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -42,7 +42,7 @@
     <dimen name="icon_notification_dimen">32dp</dimen>
     <dimen name="toolbar_margin_horizontal">8dp</dimen>
     <dimen name="toolbar_height">48dp</dimen>
-    <dimen name="item_song_height">52dp</dimen>
+    <dimen name="item_song_height">60dp</dimen>
     <dimen name="button_padding_vertical">10dp</dimen>
     <dimen name="list_pref_guideline_begin">56dp</dimen>
     <dimen name="pref_title_padding">72dp</dimen>
@@ -56,4 +56,9 @@
     <dimen name="lyrics_text_size">18sp</dimen>
     <dimen name="indicator_radius">10dp</dimen>
     <dimen name="lyrics_dialog_radius">20dp</dimen>
+
+    <dimen name="m3_card_corner_radius">16dp</dimen>
+    <dimen name="m3_card_medium_radius">24dp</dimen>
+    <dimen name="m3_card_large_radius">40dp</dimen>
+    <dimen name="padding_album_cover">16dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 58bac87f..315cdd07 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -137,12 +137,11 @@
         <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
 
-    <style name="MaterialPopupMenuStyle" parent="Widget.MaterialComponents.PopupMenu">
+    <style name="MaterialPopupMenuStyle" parent="Widget.Material3.PopupMenu">
         <item name="android:popupBackground">@drawable/popup_background</item>
     </style>
 
-    <style name="MaterialAlertDialogTheme" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
-        <item name="android:dialogCornerRadius" tools:targetApi="p">12dp</item>
+    <style name="MaterialAlertDialogTheme" parent="ThemeOverlay.Material3.MaterialAlertDialog">
         <item name="materialAlertDialogBodyTextStyle">
             @style/AppTextAppearance.MaterialAlertDialog.Body
         </item>
@@ -166,17 +165,17 @@
         <item name="android:padding">0dp</item>
     </style>
 
-    <style name="AppTextAppearance.MaterialAlertDialog.Body" parent="MaterialAlertDialog.MaterialComponents.Body.Text">
+    <style name="AppTextAppearance.MaterialAlertDialog.Body" parent="MaterialAlertDialog.Material3.Body.Text">
         <item name="android:textAppearance">@style/TextViewBody1</item>
         <item name="android:paddingTop">16dp</item>
     </style>
 
-    <style name="AppTextAppearance.MaterialAlertDialog.Title" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
+    <style name="AppTextAppearance.MaterialAlertDialog.Title" parent="MaterialAlertDialog.Material3.Title.Text">
         <item name="android:textAppearance">@style/TextViewHeadline6</item>
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="MaterialButtonTheme" parent="Widget.MaterialComponents.Button">
+    <style name="MaterialButtonTheme" parent="Widget.Material3.Button">
         <item name="cornerRadius">6dp</item>
         <item name="iconGravity">textStart</item>
         <item name="iconTint">?attr/colorControlNormal</item>
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index 39b394f2..b3eab59f 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -20,6 +20,7 @@
         <item name="floatingActionButtonStyle">
             @style/Widget.MaterialComponents.FloatingActionButton
         </item>
+        <item name="popupMenuBackground">@drawable/popup_background</item>
     </style>
 
     <style name="Theme.RetroMusic.Base" parent="Theme.Material3.DayNight.NoActionBar">
@@ -44,6 +45,7 @@
         <item name="floatingActionButtonStyle">
             @style/Widget.MaterialComponents.FloatingActionButton
         </item>
+        <item name="popupMenuBackground">@drawable/popup_background</item>
     </style>
 
     <style name="Theme.RetroMusic.Base.Black" parent="Theme.Material3.DayNight.NoActionBar">
@@ -66,6 +68,7 @@
         <item name="floatingActionButtonStyle">
             @style/Widget.MaterialComponents.FloatingActionButton
         </item>
+        <item name="popupMenuBackground">@drawable/popup_background</item>
     </style>
 
     <style name="Theme.RetroMusic.Base.Light" parent="Theme.Material3.Light.NoActionBar">
@@ -88,6 +91,7 @@
         <item name="floatingActionButtonStyle">
             @style/Widget.MaterialComponents.FloatingActionButton
         </item>
+        <item name="popupMenuBackground">@drawable/popup_background</item>
     </style>
 
     <style name="MusicProgressSliderParent">