diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountsInListFragment.kt b/app/src/main/java/com/keylesspalace/tusky/AccountsInListFragment.kt
index 3b5d8518f1..bac98a2281 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AccountsInListFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/AccountsInListFragment.kt
@@ -16,6 +16,7 @@
 
 package com.keylesspalace.tusky
 
+import android.app.Dialog
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -29,6 +30,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.ListAdapter
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.keylesspalace.tusky.databinding.FragmentAccountsInListBinding
 import com.keylesspalace.tusky.databinding.ItemFollowRequestBinding
 import com.keylesspalace.tusky.entity.TimelineAccount
@@ -39,7 +41,6 @@ import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.loadAvatar
 import com.keylesspalace.tusky.util.show
 import com.keylesspalace.tusky.util.unsafeLazy
-import com.keylesspalace.tusky.util.viewBinding
 import com.keylesspalace.tusky.util.visible
 import com.keylesspalace.tusky.viewmodel.AccountsInListViewModel
 import com.keylesspalace.tusky.viewmodel.State
@@ -50,13 +51,13 @@ import kotlinx.coroutines.launch
 private typealias AccountInfo = Pair<TimelineAccount, Boolean>
 
 @AndroidEntryPoint
-class AccountsInListFragment : DialogFragment(R.layout.fragment_accounts_in_list) {
+class AccountsInListFragment : DialogFragment() {
 
     @Inject
     lateinit var preferences: SharedPreferences
 
     private val viewModel: AccountsInListViewModel by viewModels()
-    private val binding by viewBinding(FragmentAccountsInListBinding::bind)
+    private lateinit var binding: FragmentAccountsInListBinding
 
     private lateinit var listId: String
     private lateinit var listName: String
@@ -65,7 +66,6 @@ class AccountsInListFragment : DialogFragment(R.layout.fragment_accounts_in_list
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NORMAL, R.style.TuskyDialogFragmentStyle)
         val args = requireArguments()
         listId = args.getString(LIST_ID_ARG)!!
         listName = args.getString(LIST_NAME_ARG)!!
@@ -73,6 +73,12 @@ class AccountsInListFragment : DialogFragment(R.layout.fragment_accounts_in_list
         viewModel.load(listId)
     }
 
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return MaterialAlertDialogBuilder(requireContext())
+            .setView(createView())
+            .create()
+    }
+
     override fun onStart() {
         super.onStart()
         dialog?.apply {
@@ -84,17 +90,18 @@ class AccountsInListFragment : DialogFragment(R.layout.fragment_accounts_in_list
         }
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    private fun createView(): View {
+        binding = FragmentAccountsInListBinding.inflate(layoutInflater)
         val adapter = Adapter()
         val searchAdapter = SearchAdapter()
 
-        binding.accountsRecycler.layoutManager = LinearLayoutManager(view.context)
+        binding.accountsRecycler.layoutManager = LinearLayoutManager(binding.root.context)
         binding.accountsRecycler.adapter = adapter
 
-        binding.accountsSearchRecycler.layoutManager = LinearLayoutManager(view.context)
+        binding.accountsSearchRecycler.layoutManager = LinearLayoutManager(binding.root.context)
         binding.accountsSearchRecycler.adapter = searchAdapter
 
-        viewLifecycleOwner.lifecycleScope.launch {
+        lifecycleScope.launch {
             viewModel.state.collect { state ->
                 adapter.submitList(state.accounts.getOrDefault(emptyList()))
 
@@ -122,6 +129,7 @@ class AccountsInListFragment : DialogFragment(R.layout.fragment_accounts_in_list
                 return true
             }
         })
+        return binding.root
     }
 
     private fun setupSearchView(searchAdapter: SearchAdapter, state: State) {
diff --git a/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt b/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt
index 7cd0b8eacd..e7ab6c75c1 100644
--- a/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt
@@ -19,11 +19,8 @@ import android.graphics.Color
 import android.os.Bundle
 import android.view.View
 import android.view.WindowManager
-import android.widget.FrameLayout
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.widget.AppCompatEditText
-import androidx.core.view.updatePadding
 import androidx.core.widget.doOnTextChanged
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -31,7 +28,6 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.TransitionManager
-import at.connyduck.sparkbutton.helpers.Utils
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.transition.MaterialArcMotion
 import com.google.android.material.transition.MaterialContainerTransform
@@ -41,6 +37,7 @@ import com.keylesspalace.tusky.appstore.EventHub
 import com.keylesspalace.tusky.appstore.MainTabsChangedEvent
 import com.keylesspalace.tusky.components.account.list.ListSelectionFragment
 import com.keylesspalace.tusky.databinding.ActivityTabPreferenceBinding
+import com.keylesspalace.tusky.databinding.DialogAddHashtagBinding
 import com.keylesspalace.tusky.entity.MastoList
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.util.unsafeLazy
@@ -231,18 +228,12 @@ class TabPreferenceActivity : BaseActivity(), ItemInteractionListener, ListSelec
     }
 
     private fun showAddHashtagDialog(tab: TabData? = null, tabPosition: Int = 0) {
-        val frameLayout = FrameLayout(this)
-        val padding = Utils.dpToPx(this, 8)
-        frameLayout.updatePadding(left = padding, right = padding)
-
-        val editText = AppCompatEditText(this)
-        editText.setHint(R.string.edit_hashtag_hint)
-        editText.setText("")
-        frameLayout.addView(editText)
+        val dialogBinding = DialogAddHashtagBinding.inflate(layoutInflater)
+        val editText = dialogBinding.addHashtagEditText
 
         val dialog = MaterialAlertDialogBuilder(this)
             .setTitle(R.string.add_hashtag_title)
-            .setView(frameLayout)
+            .setView(dialogBinding.root)
             .setNegativeButton(android.R.string.cancel, null)
             .setPositiveButton(R.string.action_save) { _, _ ->
                 val input = editText.text.toString().trim()
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/account/list/ListSelectionFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/account/list/ListSelectionFragment.kt
index 3837714969..bfa15b7377 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/account/list/ListSelectionFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/account/list/ListSelectionFragment.kt
@@ -66,7 +66,6 @@ class ListSelectionFragment : DialogFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NORMAL, R.style.TuskyDialogFragmentStyle)
         accountId = requireArguments().getString(ARG_ACCOUNT_ID)
     }
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/CaptionDialog.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/CaptionDialog.kt
index 7b987ee999..5c20200b72 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/CaptionDialog.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/CaptionDialog.kt
@@ -15,15 +15,14 @@
 
 package com.keylesspalace.tusky.components.compose.dialog
 
+import android.app.Dialog
 import android.content.Context
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Bundle
 import android.text.InputFilter
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.LinearLayout
 import androidx.core.os.bundleOf
@@ -32,11 +31,11 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.transition.Transition
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.databinding.DialogImageDescriptionBinding
 import com.keylesspalace.tusky.util.getParcelableCompat
 import com.keylesspalace.tusky.util.hide
-import com.keylesspalace.tusky.util.viewBinding
 
 // https://github.com/tootsuite/mastodon/blob/c6904c0d3766a2ea8a81ab025c127169ecb51373/app/models/media_attachment.rb#L32
 private const val MEDIA_DESCRIPTION_CHARACTER_LIMIT = 1500
@@ -44,22 +43,23 @@ private const val MEDIA_DESCRIPTION_CHARACTER_LIMIT = 1500
 class CaptionDialog : DialogFragment() {
     private lateinit var listener: Listener
 
-    private val binding by viewBinding(DialogImageDescriptionBinding::bind)
+    private lateinit var binding: DialogImageDescriptionBinding
 
     private var animatable: Animatable? = null
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NORMAL, R.style.TuskyDialogFragmentStyle)
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val localId = arguments?.getInt(LOCAL_ID_ARG) ?: error("Missing localId")
+        return MaterialAlertDialogBuilder(requireContext())
+            .setView(createView(savedInstanceState))
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                listener.onUpdateDescription(localId, binding.imageDescriptionText.text.toString())
+            }
+            .setNegativeButton(android.R.string.cancel, null)
+            .create()
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View = inflater.inflate(R.layout.dialog_image_description, container, false)
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    private fun createView(savedInstanceState: Bundle?): View {
+        binding = DialogImageDescriptionBinding.inflate(layoutInflater)
         val imageView = binding.imageDescriptionView
         imageView.maxZoom = 6f
         val imageDescriptionText = binding.imageDescriptionText
@@ -79,15 +79,6 @@ class CaptionDialog : DialogFragment() {
             binding.imageDescriptionText.setText(it)
         }
 
-        binding.cancelButton.setOnClickListener {
-            dismiss()
-        }
-        val localId = arguments?.getInt(LOCAL_ID_ARG) ?: error("Missing localId")
-        binding.okButton.setOnClickListener {
-            listener.onUpdateDescription(localId, binding.imageDescriptionText.text.toString())
-            dismiss()
-        }
-
         isCancelable = true
         dialog?.setCanceledOnTouchOutside(false) // Dialog is full screen anyway. But without this, taps in navbar while keyboard is up can dismiss the dialog.
 
@@ -109,15 +100,15 @@ class CaptionDialog : DialogFragment() {
                     if (resource is Animatable) {
                         resource.callback = object : Drawable.Callback {
                             override fun invalidateDrawable(who: Drawable) {
-                                view.invalidate()
+                                imageView.invalidate()
                             }
 
                             override fun scheduleDrawable(who: Drawable, what: Runnable, `when`: Long) {
-                                view.postDelayed(what, `when`)
+                                imageView.postDelayed(what, `when`)
                             }
 
                             override fun unscheduleDrawable(who: Drawable, what: Runnable) {
-                                view.removeCallbacks(what)
+                                imageView.removeCallbacks(what)
                             }
                         }
                         resource.start()
@@ -131,6 +122,7 @@ class CaptionDialog : DialogFragment() {
                     imageView.hide()
                 }
             })
+        return binding.root
     }
 
     override fun onStart() {
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/followedtags/FollowedTagsActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/followedtags/FollowedTagsActivity.kt
index ca50fdb27c..ba0d327aeb 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/followedtags/FollowedTagsActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/followedtags/FollowedTagsActivity.kt
@@ -1,14 +1,10 @@
 package com.keylesspalace.tusky.components.followedtags
 
-import android.app.Dialog
-import android.content.DialogInterface
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.util.Log
 import android.view.WindowManager
-import android.widget.AutoCompleteTextView
 import androidx.activity.viewModels
-import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import androidx.paging.LoadState
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -22,6 +18,7 @@ import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.StatusListActivity
 import com.keylesspalace.tusky.components.compose.ComposeAutoCompleteAdapter
 import com.keylesspalace.tusky.databinding.ActivityFollowedTagsBinding
+import com.keylesspalace.tusky.databinding.DialogFollowHashtagBinding
 import com.keylesspalace.tusky.interfaces.HashtagActionListener
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.util.copyToClipboard
@@ -61,8 +58,7 @@ class FollowedTagsActivity :
         }
 
         binding.fab.setOnClickListener {
-            val dialog: DialogFragment = FollowTagDialog.newInstance()
-            dialog.show(supportFragmentManager, "dialog")
+            showDialog()
         }
 
         setupAdapter().let { adapter ->
@@ -179,44 +175,34 @@ class FollowedTagsActivity :
         )
     }
 
-    companion object {
-        const val TAG = "FollowedTagsActivity"
-    }
-
-    class FollowTagDialog : DialogFragment() {
-        override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-            val layout = layoutInflater.inflate(R.layout.dialog_follow_hashtag, null)
-            val autoCompleteTextView = layout.findViewById<AutoCompleteTextView>(R.id.hashtag)!!
-            autoCompleteTextView.setAdapter(
-                ComposeAutoCompleteAdapter(
-                    requireActivity() as FollowedTagsActivity,
-                    animateAvatar = false,
-                    animateEmojis = false,
-                    showBotBadge = false
-                )
+    private fun showDialog() {
+        val dialogBinding = DialogFollowHashtagBinding.inflate(layoutInflater)
+        dialogBinding.hashtagAutoCompleteTextView.setAdapter(
+            ComposeAutoCompleteAdapter(
+                this,
+                animateAvatar = false,
+                animateEmojis = false,
+                showBotBadge = false
             )
-            autoCompleteTextView.requestFocus()
-            autoCompleteTextView.setSelection(autoCompleteTextView.length())
-
-            return MaterialAlertDialogBuilder(requireActivity())
-                .setTitle(R.string.dialog_follow_hashtag_title)
-                .setView(layout)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    (requireActivity() as FollowedTagsActivity).follow(
-                        autoCompleteTextView.text.toString().removePrefix("#")
-                    )
-                }
-                .setNegativeButton(android.R.string.cancel) { _: DialogInterface, _: Int -> }
-                .create()
-        }
-
-        override fun onStart() {
-            super.onStart()
-            dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
-        }
+        )
+        dialogBinding.hashtagAutoCompleteTextView.requestFocus()
+        dialogBinding.hashtagAutoCompleteTextView.setSelection(dialogBinding.hashtagAutoCompleteTextView.length())
+
+        val dialog = MaterialAlertDialogBuilder(this)
+            .setTitle(R.string.dialog_follow_hashtag_title)
+            .setView(dialogBinding.root)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                follow(
+                    dialogBinding.hashtagAutoCompleteTextView.text.toString().removePrefix("#")
+                )
+            }
+            .setNegativeButton(android.R.string.cancel, null)
+            .create()
+        dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
+        dialog.show()
+    }
 
-        companion object {
-            fun newInstance(): FollowTagDialog = FollowTagDialog()
-        }
+    companion object {
+        const val TAG = "FollowedTagsActivity"
     }
 }
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsFragment.kt
index c2001422d7..089f66b628 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsFragment.kt
@@ -433,7 +433,7 @@ class NotificationsFragment :
         }
 
         val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_list_item_multiple_choice, notificationTypeList)
-        val window = PopupWindow(requireContext())
+        val window = PopupWindow(requireContext(), null, com.google.android.material.R.attr.listPopupWindowStyle)
         val menuBinding = NotificationsFilterBinding.inflate(LayoutInflater.from(requireContext()), binding.root as ViewGroup, false)
 
         menuBinding.buttonApply.setOnClickListener {
diff --git a/app/src/main/java/com/keylesspalace/tusky/view/BackgroundMessageView.kt b/app/src/main/java/com/keylesspalace/tusky/view/BackgroundMessageView.kt
index c33533628f..56492853eb 100644
--- a/app/src/main/java/com/keylesspalace/tusky/view/BackgroundMessageView.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/view/BackgroundMessageView.kt
@@ -15,6 +15,8 @@ import com.keylesspalace.tusky.databinding.ViewBackgroundMessageBinding
 import com.keylesspalace.tusky.util.addDrawables
 import com.keylesspalace.tusky.util.getDrawableRes
 import com.keylesspalace.tusky.util.getErrorString
+import com.keylesspalace.tusky.util.hide
+import com.keylesspalace.tusky.util.show
 import com.keylesspalace.tusky.util.visible
 
 /**
@@ -61,7 +63,7 @@ class BackgroundMessageView @JvmOverloads constructor(
         binding.imageView.setImageResource(imageRes)
         binding.button.setOnClickListener(clickListener)
         binding.button.visible(clickListener != null)
-        binding.helpText.visible(false)
+        binding.helpTextCard.hide()
     }
 
     fun showHelp(@StringRes helpRes: Int) {
@@ -72,6 +74,6 @@ class BackgroundMessageView @JvmOverloads constructor(
 
         binding.helpText.setText(textWithDrawables, TextView.BufferType.SPANNABLE)
 
-        binding.helpText.visible(true)
+        binding.helpTextCard.show()
     }
 }
diff --git a/app/src/main/res/drawable/help_message_background.xml b/app/src/main/res/drawable/help_message_background.xml
deleted file mode 100644
index cb28b79870..0000000000
--- a/app/src/main/res/drawable/help_message_background.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="1dp"
-        android:left="-1dp"
-        android:right="-1dp"
-        android:top="1dp">
-
-        <shape android:shape="rectangle">
-            <solid android:color="?attr/colorBackgroundAccent"/>
-            <stroke android:width="1dp" android:color="?attr/dividerColor"/>
-        </shape>
-    </item>
-</layer-list>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 64efada860..cd54159277 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -34,6 +34,8 @@
                 android:layout_height="48dp"
                 android:orientation="horizontal"
                 app:contentInsetStart="0dp"
+                android:paddingLeft="0dp"
+                android:paddingRight="0dp"
                 app:contentInsetStartWithNavigation="0dp"
                 app:navigationContentDescription="@string/action_open_drawer">
 
diff --git a/app/src/main/res/layout/dialog_add_hashtag.xml b/app/src/main/res/layout/dialog_add_hashtag.xml
new file mode 100644
index 0000000000..799a1fb26b
--- /dev/null
+++ b/app/src/main/res/layout/dialog_add_hashtag.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="20dp"
+    android:paddingTop="16dp"
+    android:paddingRight="20dp">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/addHashtagInputLayout"
+        style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/edit_hashtag_hint"
+        app:endIconMode="none">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/addHashtagEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textNoSuggestions"
+            android:lines="1" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/dialog_filter.xml b/app/src/main/res/layout/dialog_filter.xml
index 376167d9ad..ee91bbb29c 100644
--- a/app/src/main/res/layout/dialog_filter.xml
+++ b/app/src/main/res/layout/dialog_filter.xml
@@ -1,34 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="24dp">
+    android:paddingLeft="20dp"
+    android:paddingTop="16dp"
+    android:paddingRight="20dp">
 
-    <EditText
-        android:id="@+id/phraseEditText"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/phraseInputLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/filter_add_description"
-        android:inputType="text"
-        android:importantForAutofill="no"
-        app:layout_constraintTop_toTopOf="parent"
-        />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/phraseEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:importantForAutofill="no"
+            android:inputType="text" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
     <CheckBox
         android:id="@+id/phraseWholeWord"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
         android:text="@string/filter_dialog_whole_word"
-        app:layout_constraintTop_toBottomOf="@id/phraseEditText"
         app:layout_constraintLeft_toLeftOf="parent"
-        />
+        app:layout_constraintTop_toBottomOf="@id/phraseInputLayout" />
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:lineSpacingMultiplier="1.1"
-        app:layout_constraintTop_toBottomOf="@id/phraseWholeWord"
-        app:layout_constraintLeft_toLeftOf="parent"
         android:text="@string/filter_dialog_whole_word_description"
-        />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/phraseWholeWord" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_follow_hashtag.xml b/app/src/main/res/layout/dialog_follow_hashtag.xml
index cdcf3024bf..dca465eaf5 100644
--- a/app/src/main/res/layout/dialog_follow_hashtag.xml
+++ b/app/src/main/res/layout/dialog_follow_hashtag.xml
@@ -1,16 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+    android:layout_height="wrap_content"
+    android:paddingLeft="20dp"
+    android:paddingTop="16dp"
+    android:paddingRight="20dp">
 
-    <!-- textNoSuggestions is to disable spell check, it will auto-complete -->
-    <AutoCompleteTextView
-        android:id="@+id/hashtag"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/hashtagAutoCompleteInputLayout"
+        style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inputType="textNoSuggestions"
-        android:hint="@string/dialog_follow_hashtag_hint" />
+        android:hint="@string/dialog_follow_hashtag_hint"
+        app:endIconMode="none">
+
+        <!-- textNoSuggestions is to disable spell check, it will auto-complete -->
+        <com.google.android.material.textfield.MaterialAutoCompleteTextView
+            android:id="@+id/hashtagAutoCompleteTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textNoSuggestions"
+            android:lines="1" />
+
+    </com.google.android.material.textfield.TextInputLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_image_description.xml b/app/src/main/res/layout/dialog_image_description.xml
index e44b4887ea..75e278f810 100644
--- a/app/src/main/res/layout/dialog_image_description.xml
+++ b/app/src/main/res/layout/dialog_image_description.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -17,7 +16,6 @@
 
     <com.google.android.material.textfield.TextInputLayout
         style="@style/TuskyTextInput"
-
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
@@ -39,27 +37,4 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:orientation="horizontal"
-        android:gravity="end"
-        android:layout_marginStart="?dialogPreferredPadding"
-        android:layout_marginEnd="?dialogPreferredPadding">
-
-        <Button
-            android:id="@+id/cancelButton"
-            style="@style/TuskyButton.TextButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@android:string/cancel" />
-
-        <Button
-            android:id="@+id/okButton"
-            style="@style/TuskyButton.TextButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@android:string/ok" />
-    </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/notifications_filter.xml b/app/src/main/res/layout/notifications_filter.xml
index 20aa5f43b1..d9f182c626 100644
--- a/app/src/main/res/layout/notifications_filter.xml
+++ b/app/src/main/res/layout/notifications_filter.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="200dp"
+    android:layout_width="200dp"
     android:layout_height="wrap_content"
-    android:background="?android:attr/windowBackground">
+    android:orientation="vertical">
+
     <ListView
         android:id="@+id/listView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1" />
+
     <Button
         android:id="@+id/buttonApply"
         style="@style/TuskyButton.TextButton"
@@ -16,4 +18,5 @@
         android:layout_weight="0"
         android:text="@string/filter_apply"
         android:textSize="?attr/status_text_medium" />
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_background_message.xml b/app/src/main/res/layout/view_background_message.xml
index 12f0108052..3bd2efba91 100644
--- a/app/src/main/res/layout/view_background_message.xml
+++ b/app/src/main/res/layout/view_background_message.xml
@@ -1,24 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     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:orientation="vertical"
     tools:parentTag="android.widget.LinearLayout">
 
-    <TextView
-        android:id="@+id/helpText"
-        android:visibility="gone"
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/helpTextCard"
+        style="@style/Widget.Material3.CardView.Filled"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:lineSpacingMultiplier="1.1"
-        android:textColor="@color/textColorPrimary"
-        android:background="@drawable/help_message_background"
-        android:layout_marginTop="16dp"
-        android:padding="16dp"
-        android:textAlignment="viewStart"
-        android:textSize="?attr/status_text_medium" />
+        android:layout_margin="8dp"
+        android:visibility="gone"
+        app:cardBackgroundColor="?attr/colorSurface">
+
+        <TextView
+            android:id="@+id/helpText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            android:lineSpacingMultiplier="1.1"
+            android:textColor="@color/textColorPrimary"
+            android:textSize="?attr/status_text_medium"
+            tools:text="@string/help_empty_home" />
+
+    </com.google.android.material.card.MaterialCardView>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -43,8 +51,8 @@
             android:drawablePadding="16dp"
             android:lineSpacingMultiplier="1.1"
             android:paddingLeft="16dp"
-            android:paddingRight="16dp"
             android:paddingTop="16dp"
+            android:paddingRight="16dp"
             android:text="@string/error_network"
             android:textAlignment="center"
             android:textSize="?attr/status_text_medium" />
@@ -54,8 +62,10 @@
             style="@style/TuskyButton.Outlined"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
             android:layout_marginTop="8dp"
+            android:layout_marginBottom="4dp"
             android:text="@string/action_retry" />
+
     </LinearLayout>
+
 </merge>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ae13980243..69f65a9b11 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -99,6 +99,9 @@
         <item name="alertDialogTheme">@style/TuskyDialogOverlay</item>
         <item name="dialogCornerRadius">16dp</item>
 
+        <item name="materialTimePickerTheme">@style/TuskyTimePickerOverlay</item>
+        <item name="materialCalendarTheme">@style/TuskyDatePickerOverlay</item>
+
         <item name="minTouchTargetSize">32dp</item> <!-- this affects RadioButton size -->
         <item name="elevationOverlayEnabled">false</item> <!-- disable the automatic tinting of surfaces with elevation in dark mode -->
 
@@ -120,12 +123,21 @@
         <item name="windowBackgroundColor">@color/black</item>
 
         <item name="colorSurface">@color/tusky_grey_10</item>
+        <item name="colorSurfaceVariant">@color/tusky_grey_10</item>
+
+        <item name="colorSurfaceContainerLowest">@color/tusky_grey_10</item>
+        <item name="colorSurfaceContainerLow">@color/tusky_grey_10</item>
+        <item name="colorSurfaceContainer">@color/tusky_grey_10</item>
+        <item name="colorSurfaceContainerHigh">@color/tusky_grey_10</item>
+        <item name="colorSurfaceContainerHighest">@color/tusky_grey_10</item>
 
         <item name="iconColor">@color/tusky_grey_40</item>
         <item name="colorBackgroundHighlight">@color/tusky_grey_40</item>
         <item name="colorBackgroundAccent">@color/tusky_grey_20</item>
 
         <item name="dividerColor">@color/tusky_grey_20</item>
+        <item name="colorOutlineVariant">@color/tusky_grey_20</item>
+
     </style>
 
     <style name="TuskyBlackTheme" parent="TuskyBlackThemeBase" />
@@ -143,13 +155,22 @@
     <style name="TuskyDialog" parent="@style/MaterialAlertDialog.Material3">
         <item name="shapeAppearance">@style/ShapeAppearance.Material3.Corner.Large</item>
         <item name="backgroundTint">@color/colorBackground</item>
-        <item name="buttonBarNeutralButtonStyle">@style/TuskyButton.TextButton</item>
-        <item name="buttonBarPositiveButtonStyle">@style/TuskyButton.TextButton</item>
-        <item name="buttonBarNegativeButtonStyle">@style/TuskyButton.TextButton</item>
     </style>
 
-    <style name="TuskyDialogFragmentStyle" parent="@style/ThemeOverlay.Material3.Dialog">
-        <item name="dialogCornerRadius">8dp</item>
+    <style name="TuskyTimePickerOverlay" parent="@style/ThemeOverlay.MaterialComponents.TimePicker">
+        <item name="materialTimePickerStyle">@style/TuskyTimePicker</item>
+    </style>
+    <style name="TuskyTimePicker" parent="@style/Widget.Material3.MaterialTimePicker">
+        <item name="shapeAppearance">@style/ShapeAppearance.Material3.Corner.Large</item>
+        <item name="backgroundTint">@color/colorBackground</item>
+    </style>
+
+    <style name="TuskyDatePickerOverlay" parent="@style/ThemeOverlay.MaterialComponents.MaterialCalendar">
+        <item name="materialCalendarStyle">@style/TuskyDatePicker</item>
+    </style>
+    <style name="TuskyDatePicker" parent="@style/Widget.Material3.MaterialCalendar">
+        <item name="shapeAppearance">@style/ShapeAppearance.Material3.Corner.Large</item>
+        <item name="backgroundTint">@color/colorBackground</item>
     </style>
 
     <style name="TuskyTabAppearance" parent="Widget.Material3.TabLayout">