diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
index 6588e80bc..4185287f3 100755
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
@@ -41,12 +41,12 @@ import code.name.monkey.retromusic.R.drawable
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.activities.saf.SAFGuideActivity
 import code.name.monkey.retromusic.extensions.accentColor
+import code.name.monkey.retromusic.extensions.colorButtons
 import code.name.monkey.retromusic.extensions.hideSoftKeyboard
 import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto
 import code.name.monkey.retromusic.model.ArtworkInfo
 import code.name.monkey.retromusic.model.AudioTagInfo
 import code.name.monkey.retromusic.repository.Repository
-import code.name.monkey.retromusic.util.RetroUtil
 import code.name.monkey.retromusic.util.SAFUtil
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -93,7 +93,9 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
                         2 -> deleteImage()
                     }
                 }
+                .setNegativeButton(R.string.action_cancel, null)
                 .show()
+                .colorButtons()
 
     internal val albumArtist: String?
         get() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt
index 03c991935..c4bdd047d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt
@@ -16,7 +16,6 @@ package code.name.monkey.retromusic.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
-import android.widget.ArrayAdapter
 import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
 import code.name.monkey.retromusic.EXTRA_PLAYLISTS
@@ -50,12 +49,6 @@ class AddToPlaylistDialog : DialogFragment() {
         }
     }
 
-    private fun playlistAdapter(playlists: List<String>): ArrayAdapter<String> {
-        val adapter = ArrayAdapter<String>(requireContext(), R.layout.item_simple_text, R.id.title)
-        adapter.addAll(playlists)
-        return adapter
-    }
-
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val playlistEntities = extraNotNull<List<PlaylistEntity>>(EXTRA_PLAYLISTS).value
         val songs = extraNotNull<List<Song>>(EXTRA_SONG).value
@@ -65,10 +58,8 @@ class AddToPlaylistDialog : DialogFragment() {
             playlistNames.add(entity.playlistName)
         }
         return materialDialog(R.string.add_playlist_title)
-            .setAdapter(
-                playlistAdapter(playlistNames)
-            ) { dialog, which ->
-                if (which == 0) {
+            .setItems(playlistNames.toTypedArray()) { dialog, which->
+                 if (which == 0) {
                     showCreateDialog(songs)
                 } else {
                     libraryViewModel.addToPlaylist(requireContext(), playlistNames[which], songs)
@@ -76,7 +67,8 @@ class AddToPlaylistDialog : DialogFragment() {
                 dialog.dismiss()
             }
             .setNegativeButton(R.string.action_cancel, null)
-            .create().colorButtons()
+            .create()
+            .colorButtons()
     }
 
     private fun showCreateDialog(songs: List<Song>) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt
index 8f1dbd5a0..bd9b3e258 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt
@@ -69,6 +69,7 @@ class CreatePlaylistDialog : DialogFragment() {
                     playlistContainer.error = "Playlist name can't be empty"
                 }
             }
+            .setNegativeButton(R.string.action_cancel, null)
             .create()
             .colorButtons()
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt
index 5c7af6733..ab50e3dc4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt
@@ -46,6 +46,7 @@ class SongShareDialog : DialogFragment() {
             ) { _, which ->
                 withAction(which, song, listening)
             }
+            .setNegativeButton(R.string.action_cancel, null)
             .create()
             .colorButtons()
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/DialogExtension.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/DialogExtension.kt
index 63f77e134..20387ffd8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/DialogExtension.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/extensions/DialogExtension.kt
@@ -28,6 +28,13 @@ fun DialogFragment.materialDialog(title: Int): MaterialAlertDialogBuilder {
     ).setTitle(title)
 }
 
+fun Fragment.materialDialog(title: Int): MaterialAlertDialogBuilder {
+    return MaterialAlertDialogBuilder(
+        requireContext(),
+        R.style.MaterialAlertDialogTheme
+    ).setTitle(title)
+}
+
 fun AlertDialog.colorButtons(): AlertDialog {
     setOnShowListener {
         getButton(AlertDialog.BUTTON_POSITIVE).accentTextColor()
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt
index f56644cae..27066c5b9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt
@@ -147,9 +147,7 @@ class BackupFragment : Fragment(R.layout.fragment_backup), BackupAdapter.BackupC
                             file.renameTo(renamedFile)
                             backupViewModel.loadBackups()
                         } else {
-                            showToast(
-                                "File already exists"
-                            )
+                            showToast("File already exists")
                         }
                     }
                     positiveButton(android.R.string.ok)
diff --git a/app/src/main/res/layout/dialog_playlist.xml b/app/src/main/res/layout/dialog_playlist.xml
index 5810be9c4..b1deabcdf 100644
--- a/app/src/main/res/layout/dialog_playlist.xml
+++ b/app/src/main/res/layout/dialog_playlist.xml
@@ -6,7 +6,6 @@
     android:orientation="vertical"
     android:padding="16dp">
 
-
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/actionNewPlaylistContainer"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"