diff --git a/app/src/main/java/com/github/libretube/dialogs/AddtoPlaylistDialog.kt b/app/src/main/java/com/github/libretube/dialogs/AddtoPlaylistDialog.kt
index cabc0826b..0cc9119ad 100644
--- a/app/src/main/java/com/github/libretube/dialogs/AddtoPlaylistDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/AddtoPlaylistDialog.kt
@@ -4,17 +4,14 @@ import android.app.Dialog
 import android.os.Bundle
 import android.util.Log
 import android.util.TypedValue
-import android.view.View
 import android.widget.ArrayAdapter
-import android.widget.Button
-import android.widget.Spinner
-import android.widget.TextView
 import android.widget.Toast
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import com.github.libretube.R
+import com.github.libretube.databinding.DialogAddtoplaylistBinding
 import com.github.libretube.obj.PlaylistId
 import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
@@ -24,23 +21,22 @@ import java.io.IOException
 
 class AddtoPlaylistDialog : DialogFragment() {
     private val TAG = "AddToPlaylistDialog"
+    private lateinit var binding: DialogAddtoplaylistBinding
+
     private lateinit var videoId: String
     private lateinit var token: String
-    private lateinit var spinner: Spinner
-    private lateinit var button: Button
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return activity?.let {
             videoId = arguments?.getString("videoId")!!
             val builder = MaterialAlertDialogBuilder(it)
             // Get the layout inflater
-            val inflater = requireActivity().layoutInflater
+            binding = DialogAddtoplaylistBinding.inflate(layoutInflater)
+
             token = PreferenceHelper.getToken(requireContext())
-            var view: View = inflater.inflate(R.layout.dialog_addtoplaylist, null)
-            spinner = view.findViewById(R.id.playlists_spinner)
-            button = view.findViewById(R.id.addToPlaylist)
-            if (token != "") {
-                fetchPlaylists()
-            }
+
+            if (token != "") fetchPlaylists()
+
             val typedValue = TypedValue()
             this.requireActivity().theme.resolveAttribute(R.attr.colorPrimaryDark, typedValue, true)
             val hexColor = String.format("#%06X", (0xFFFFFF and typedValue.data))
@@ -48,9 +44,9 @@ class AddtoPlaylistDialog : DialogFragment() {
                 "Libre<span  style='color:$hexColor';>Tube</span>",
                 HtmlCompat.FROM_HTML_MODE_COMPACT
             )
-            view.findViewById<TextView>(R.id.title).text = appName
+            binding.title.text = appName
 
-            builder.setView(view)
+            builder.setView(binding.root)
             builder.create()
         } ?: throw IllegalStateException("Activity cannot be null")
     }
@@ -80,10 +76,12 @@ class AddtoPlaylistDialog : DialogFragment() {
                     arrayAdapter.setDropDownViewResource(
                         android.R.layout.simple_spinner_dropdown_item
                     )
-                    spinner.adapter = arrayAdapter
+                    binding.playlistsSpinner.adapter = arrayAdapter
                     runOnUiThread {
-                        button.setOnClickListener {
-                            addToPlaylist(response[spinner.selectedItemPosition].id!!)
+                        binding.addToPlaylist.setOnClickListener {
+                            addToPlaylist(
+                                response[binding.playlistsSpinner.selectedItemPosition].id!!
+                            )
                         }
                     }
                 } else {
diff --git a/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt b/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt
index d08256704..c08a9096a 100644
--- a/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/CreatePlaylistDialog.kt
@@ -4,32 +4,29 @@ import android.app.Dialog
 import android.os.Bundle
 import android.util.Log
 import android.util.TypedValue
-import android.view.View
-import android.widget.Button
-import android.widget.TextView
 import android.widget.Toast
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import com.github.libretube.R
+import com.github.libretube.databinding.DialogCreatePlaylistBinding
 import com.github.libretube.fragments.Library
 import com.github.libretube.obj.Playlists
 import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.textfield.TextInputEditText
 import retrofit2.HttpException
 import java.io.IOException
 
 class CreatePlaylistDialog : DialogFragment() {
     val TAG = "CreatePlaylistDialog"
     private var token: String = ""
+    private lateinit var binding: DialogCreatePlaylistBinding
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return activity?.let {
             val builder = MaterialAlertDialogBuilder(it)
-            val inflater = requireActivity().layoutInflater
-            val view: View = inflater.inflate(R.layout.dialog_create_playlist, null)
+            binding = DialogCreatePlaylistBinding.inflate(layoutInflater)
 
             val typedValue = TypedValue()
             this.requireActivity().theme.resolveAttribute(R.attr.colorPrimaryDark, typedValue, true)
@@ -38,21 +35,18 @@ class CreatePlaylistDialog : DialogFragment() {
                 "Libre<span  style='color:$hexColor';>Tube</span>",
                 HtmlCompat.FROM_HTML_MODE_COMPACT
             )
-            view.findViewById<TextView>(R.id.title).text = appName
+            binding.title.text = appName
 
-            val cancelBtn = view.findViewById<Button>(R.id.cancel_button)
-            cancelBtn.setOnClickListener {
+            binding.cancelButton.setOnClickListener {
                 dismiss()
             }
 
             token = PreferenceHelper.getToken(requireContext())
 
-            val playlistName = view.findViewById<TextInputEditText>(R.id.playlist_name)
-            val createPlaylistBtn = view.findViewById<Button>(R.id.create_new_playlist)
-            createPlaylistBtn.setOnClickListener {
+            binding.createNewPlaylist.setOnClickListener {
                 // avoid creating the same playlist multiple times by spamming the button
-                createPlaylistBtn.setOnClickListener(null)
-                val listName = playlistName.text.toString()
+                binding.createNewPlaylist.setOnClickListener(null)
+                val listName = binding.playlistName.text.toString()
                 if (listName != "") {
                     createPlaylist(listName)
                 } else {
@@ -60,7 +54,7 @@ class CreatePlaylistDialog : DialogFragment() {
                 }
             }
 
-            builder.setView(view)
+            builder.setView(binding.root)
             builder.create()
         } ?: throw IllegalStateException("Activity cannot be null")
     }
diff --git a/app/src/main/java/com/github/libretube/dialogs/CustomInstanceDialog.kt b/app/src/main/java/com/github/libretube/dialogs/CustomInstanceDialog.kt
index 94df2f77d..9cd1769fe 100644
--- a/app/src/main/java/com/github/libretube/dialogs/CustomInstanceDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/CustomInstanceDialog.kt
@@ -3,44 +3,34 @@ package com.github.libretube.dialogs
 import android.app.Dialog
 import android.os.Bundle
 import android.util.TypedValue
-import android.view.View
-import android.widget.Button
-import android.widget.TextView
 import android.widget.Toast
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.DialogFragment
 import com.github.libretube.R
+import com.github.libretube.databinding.DialogCustomInstanceBinding
 import com.github.libretube.obj.CustomInstance
 import com.github.libretube.util.PreferenceHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.textfield.TextInputEditText
 import java.net.URL
 
 class CustomInstanceDialog : DialogFragment() {
     val TAG = "CustomInstanceDialog"
+    private lateinit var binding: DialogCustomInstanceBinding
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return activity?.let {
             val builder = MaterialAlertDialogBuilder(it)
-            val inflater = requireActivity().layoutInflater
-            val view: View = inflater.inflate(R.layout.dialog_custom_instance, null)
+            binding = DialogCustomInstanceBinding.inflate(layoutInflater)
 
-            val instanceNameEditText = view.findViewById<TextInputEditText>(R.id.instanceName)
-            val instanceApiUrlEditText = view.findViewById<TextInputEditText>(R.id.instanceApiUrl)
-            val instanceFrontendUrlEditText = view
-                .findViewById<TextInputEditText>(R.id.instanceFrontendUrl)
-
-            val addInstanceButton = view.findViewById<Button>(R.id.addInstance)
-            val cancelButton = view.findViewById<Button>(R.id.cancel)
-            cancelButton.setOnClickListener {
+            binding.cancel.setOnClickListener {
                 dismiss()
             }
 
-            addInstanceButton.setOnClickListener {
+            binding.addInstance.setOnClickListener {
                 val customInstance = CustomInstance()
-                customInstance.name = instanceNameEditText.text.toString()
-                customInstance.apiUrl = instanceApiUrlEditText.text.toString()
-                customInstance.frontendUrl = instanceFrontendUrlEditText.text.toString()
+                customInstance.name = binding.instanceName.text.toString()
+                customInstance.apiUrl = binding.instanceApiUrl.text.toString()
+                customInstance.frontendUrl = binding.instanceFrontendUrl.text.toString()
 
                 if (
                     customInstance.name != "" &&
@@ -80,9 +70,9 @@ class CustomInstanceDialog : DialogFragment() {
                 "Libre<span  style='color:$hexColor';>Tube</span>",
                 HtmlCompat.FROM_HTML_MODE_COMPACT
             )
-            view.findViewById<TextView>(R.id.title).text = appName
+            binding.title.text = appName
 
-            builder.setView(view)
+            builder.setView(binding.root)
             builder.create()
         } ?: throw IllegalStateException("Activity cannot be null")
     }
diff --git a/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt b/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt
index a9e0da91d..d815c490d 100644
--- a/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/DeleteAccountDialog.kt
@@ -4,14 +4,12 @@ import android.app.Dialog
 import android.os.Bundle
 import android.util.Log
 import android.util.TypedValue
-import android.widget.Button
-import android.widget.EditText
-import android.widget.TextView
 import android.widget.Toast
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import com.github.libretube.R
+import com.github.libretube.databinding.DialogDeleteAccountBinding
 import com.github.libretube.obj.DeleteUserRequest
 import com.github.libretube.requireMainActivityRestart
 import com.github.libretube.util.PreferenceHelper
@@ -20,22 +18,20 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class DeleteAccountDialog : DialogFragment() {
     private val TAG = "DeleteAccountDialog"
-    lateinit var username: EditText
-    lateinit var password: EditText
+    private lateinit var binding: DialogDeleteAccountBinding
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return activity?.let {
             val builder = MaterialAlertDialogBuilder(it)
-            val inflater = requireActivity().layoutInflater
-            val view = inflater.inflate(R.layout.dialog_delete_account, null)
+            binding = DialogDeleteAccountBinding.inflate(layoutInflater)
 
-            view.findViewById<Button>(R.id.cancel_button).setOnClickListener {
+            binding.cancelButton.setOnClickListener {
                 dialog?.dismiss()
             }
 
-            password = view.findViewById(R.id.delete_password)
-            view.findViewById<Button>(R.id.delete_account_confirm).setOnClickListener {
-                if (password.text.toString() != "") {
-                    deleteAccount(password.text.toString())
+            binding.deleteAccountConfirm.setOnClickListener {
+                if (binding.deletePassword.text.toString() != "") {
+                    deleteAccount(binding.deletePassword.text.toString())
                 } else {
                     Toast.makeText(context, R.string.empty, Toast.LENGTH_SHORT).show()
                 }
@@ -48,9 +44,9 @@ class DeleteAccountDialog : DialogFragment() {
                 "Libre<span  style='color:$hexColor';>Tube</span>",
                 HtmlCompat.FROM_HTML_MODE_COMPACT
             )
-            view.findViewById<TextView>(R.id.title).text = appName
+            binding.title.text = appName
 
-            builder.setView(view)
+            builder.setView(binding.root)
             builder.create()
         } ?: throw IllegalStateException("Activity cannot be null")
     }
diff --git a/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt b/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt
index cc467c313..3c5cc2677 100644
--- a/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt
@@ -9,22 +9,20 @@ import android.os.Bundle
 import android.os.Environment
 import android.util.Log
 import android.util.TypedValue
-import android.view.View
 import android.widget.ArrayAdapter
-import android.widget.Button
-import android.widget.Spinner
-import android.widget.TextView
 import androidx.core.app.ActivityCompat
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.DialogFragment
 import com.github.libretube.MainActivity
 import com.github.libretube.R
+import com.github.libretube.databinding.DialogDownloadBinding
 import com.github.libretube.obj.Streams
 import com.github.libretube.services.DownloadService
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 class DownloadDialog : DialogFragment() {
     private val TAG = "DownloadDialog"
+    private lateinit var binding: DialogDownloadBinding
 
     private lateinit var streams: Streams
     private lateinit var videoId: String
@@ -37,9 +35,7 @@ class DownloadDialog : DialogFragment() {
 
             val mainActivity = activity as MainActivity
             val builder = MaterialAlertDialogBuilder(it)
-            // Get the layout inflater
-            val inflater = requireActivity().layoutInflater
-            var view: View = inflater.inflate(R.layout.dialog_download, null)
+            binding = DialogDownloadBinding.inflate(layoutInflater)
 
             // request storage permissions if not granted yet
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
@@ -103,29 +99,27 @@ class DownloadDialog : DialogFragment() {
                 audioUrl.add(audio.url!!)
             }
 
-            val videoSpinner = view.findViewById<Spinner>(R.id.video_spinner)
             val videoArrayAdapter = ArrayAdapter(
                 requireContext(),
                 android.R.layout.simple_spinner_item,
                 vidName
             )
             videoArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-            videoSpinner.adapter = videoArrayAdapter
-            videoSpinner.setSelection(1)
+            binding.videoSpinner.adapter = videoArrayAdapter
+            binding.videoSpinner.setSelection(1)
 
-            val audioSpinner = view.findViewById<Spinner>(R.id.audio_spinner)
             val audioArrayAdapter = ArrayAdapter(
                 requireContext(),
                 android.R.layout.simple_spinner_item,
                 audioName
             )
             audioArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-            audioSpinner.adapter = audioArrayAdapter
-            audioSpinner.setSelection(1)
+            binding.audioSpinner.adapter = audioArrayAdapter
+            binding.audioSpinner.setSelection(1)
 
-            view.findViewById<Button>(R.id.download).setOnClickListener {
-                val selectedAudioUrl = audioUrl[audioSpinner.selectedItemPosition]
-                val selectedVideoUrl = vidUrl[videoSpinner.selectedItemPosition]
+            binding.download.setOnClickListener {
+                val selectedAudioUrl = audioUrl[binding.audioSpinner.selectedItemPosition]
+                val selectedVideoUrl = vidUrl[binding.videoSpinner.selectedItemPosition]
 
                 val intent = Intent(context, DownloadService::class.java)
                 intent.putExtra("videoId", videoId)
@@ -143,9 +137,9 @@ class DownloadDialog : DialogFragment() {
                 "Libre<span  style='color:$hexColor';>Tube</span>",
                 HtmlCompat.FROM_HTML_MODE_COMPACT
             )
-            view.findViewById<TextView>(R.id.title).text = appName
+            binding.title.text = appName
 
-            builder.setView(view)
+            builder.setView(binding.root)
             builder.create()
         } ?: throw IllegalStateException("Activity cannot be null")
     }
diff --git a/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt b/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt
index 466249620..70a6cd2ea 100644
--- a/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt
+++ b/app/src/main/java/com/github/libretube/dialogs/LoginDialog.kt
@@ -4,15 +4,12 @@ import android.app.Dialog
 import android.os.Bundle
 import android.util.Log
 import android.util.TypedValue
-import android.view.View
-import android.widget.Button
-import android.widget.EditText
-import android.widget.TextView
 import android.widget.Toast
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import com.github.libretube.R
+import com.github.libretube.databinding.DialogLoginBinding
 import com.github.libretube.obj.Login
 import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
@@ -22,45 +19,34 @@ import java.io.IOException
 
 class LoginDialog : DialogFragment() {
     private val TAG = "LoginDialog"
-    lateinit var username: EditText
-    lateinit var password: EditText
+    private lateinit var binding: DialogLoginBinding
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return activity?.let {
             val builder = MaterialAlertDialogBuilder(it)
             // Get the layout inflater
-            val inflater = requireActivity().layoutInflater
-            val token = PreferenceHelper.getToken(requireContext())
-            var view: View
-            Log.e("dafaq", token!!)
-            if (token != "") {
-                val user = PreferenceHelper.getUsername(requireContext())
-                view = inflater.inflate(R.layout.dialog_logout, null)
-                view.findViewById<TextView>(R.id.user).text =
-                    view.findViewById<TextView>(R.id.user).text.toString() + " (" + user + ")"
-                view.findViewById<Button>(R.id.logout).setOnClickListener {
-                    Toast.makeText(context, R.string.loggedout, Toast.LENGTH_SHORT).show()
-                    PreferenceHelper.setToken(requireContext(), "")
-                    dialog?.dismiss()
+            binding = DialogLoginBinding.inflate(layoutInflater)
+
+            binding.login.setOnClickListener {
+                if (binding.username.text.toString() != "" && binding.password.text.toString() != "") {
+                    val login = Login(binding.username.text.toString(), binding.password.text.toString())
+                    login(login)
+                } else {
+                    Toast.makeText(context, R.string.empty, Toast.LENGTH_SHORT).show()
                 }
-            } else {
-                view = inflater.inflate(R.layout.dialog_login, null)
-                username = view.findViewById(R.id.username)
-                password = view.findViewById(R.id.password)
-                view.findViewById<Button>(R.id.login).setOnClickListener {
-                    if (username.text.toString() != "" && password.text.toString() != "") {
-                        val login = Login(username.text.toString(), password.text.toString())
-                        login(login)
-                    } else {
-                        Toast.makeText(context, R.string.empty, Toast.LENGTH_SHORT).show()
-                    }
-                }
-                view.findViewById<Button>(R.id.register).setOnClickListener {
-                    if (username.text.toString() != "" && password.text.toString() != "") {
-                        val login = Login(username.text.toString(), password.text.toString())
-                        register(login)
-                    } else {
-                        Toast.makeText(context, R.string.empty, Toast.LENGTH_SHORT).show()
-                    }
+            }
+            binding.register.setOnClickListener {
+                if (
+                    binding.username.text.toString() != "" &&
+                    binding.password.text.toString() != ""
+                ) {
+                    val login = Login(
+                        binding.username.text.toString(),
+                        binding.password.text.toString()
+                    )
+                    register(login)
+                } else {
+                    Toast.makeText(context, R.string.empty, Toast.LENGTH_SHORT).show()
                 }
             }
 
@@ -71,9 +57,9 @@ class LoginDialog : DialogFragment() {
                 "Libre<span  style='color:$hexColor';>Tube</span>",
                 HtmlCompat.FROM_HTML_MODE_COMPACT
             )
-            view.findViewById<TextView>(R.id.title).text = appName
+            binding.title.text = appName
 
-            builder.setView(view)
+            builder.setView(binding.root)
             builder.create()
         } ?: throw IllegalStateException("Activity cannot be null")
     }
diff --git a/app/src/main/java/com/github/libretube/dialogs/LogoutDialog.kt b/app/src/main/java/com/github/libretube/dialogs/LogoutDialog.kt
new file mode 100644
index 000000000..5ee1b4b37
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/dialogs/LogoutDialog.kt
@@ -0,0 +1,46 @@
+package com.github.libretube.dialogs
+
+import android.app.Dialog
+import android.os.Bundle
+import android.util.TypedValue
+import android.widget.Toast
+import androidx.core.text.HtmlCompat
+import androidx.fragment.app.DialogFragment
+import com.github.libretube.R
+import com.github.libretube.databinding.DialogLogoutBinding
+import com.github.libretube.util.PreferenceHelper
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+
+class LogoutDialog : DialogFragment() {
+    private val TAG = "LogoutDialog"
+    private lateinit var binding: DialogLogoutBinding
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return activity?.let {
+            val builder = MaterialAlertDialogBuilder(it)
+            binding = DialogLogoutBinding.inflate(layoutInflater)
+
+            val user = PreferenceHelper.getUsername(requireContext())
+
+            binding.user.text =
+                binding.user.text.toString() + " (" + user + ")"
+            binding.logout.setOnClickListener {
+                Toast.makeText(context, R.string.loggedout, Toast.LENGTH_SHORT).show()
+                PreferenceHelper.setToken(requireContext(), "")
+                dialog?.dismiss()
+            }
+
+            val typedValue = TypedValue()
+            this.requireActivity().theme.resolveAttribute(R.attr.colorPrimaryDark, typedValue, true)
+            val hexColor = String.format("#%06X", (0xFFFFFF and typedValue.data))
+            val appName = HtmlCompat.fromHtml(
+                "Libre<span  style='color:$hexColor';>Tube</span>",
+                HtmlCompat.FROM_HTML_MODE_COMPACT
+            )
+            binding.title.text = appName
+
+            builder.setView(binding.root)
+            builder.create()
+        } ?: throw IllegalStateException("Activity cannot be null")
+    }
+}
diff --git a/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt b/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt
index f34042572..e5007999d 100644
--- a/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt
+++ b/app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt
@@ -22,6 +22,7 @@ import com.github.libretube.R
 import com.github.libretube.dialogs.CustomInstanceDialog
 import com.github.libretube.dialogs.DeleteAccountDialog
 import com.github.libretube.dialogs.LoginDialog
+import com.github.libretube.dialogs.LogoutDialog
 import com.github.libretube.requireMainActivityRestart
 import com.github.libretube.util.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
@@ -140,9 +141,15 @@ class InstanceSettings : PreferenceFragmentCompat() {
 
         val login = findPreference<Preference>("login_register")
         login?.setOnPreferenceClickListener {
-            requireMainActivityRestart = true
-            val newFragment = LoginDialog()
-            newFragment.show(childFragmentManager, "Login")
+            val token = PreferenceHelper.getToken(requireContext())
+            if (token == "") {
+                val newFragment = LoginDialog()
+                newFragment.show(childFragmentManager, "Login")
+            } else {
+                val newFragment = LogoutDialog()
+                newFragment.show(childFragmentManager, "Logout")
+            }
+
             true
         }
 
diff --git a/app/src/main/res/layout/dialog_logout.xml b/app/src/main/res/layout/dialog_logout.xml
index 4d3bb82ad..777d092a4 100644
--- a/app/src/main/res/layout/dialog_logout.xml
+++ b/app/src/main/res/layout/dialog_logout.xml
@@ -24,6 +24,7 @@
     <Button
         android:id="@+id/logout"
         style="@style/CustomDialogButton"
+        android:layout_marginRight="16dp"
         android:text="@string/logout" />
 
 </LinearLayout>