diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
index b52280181c71bde8928b32aea05f55962b960c21..b33d1c2be16a10d2501aefa727a0c7df09b93940 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
@@ -85,8 +85,8 @@ public class AccountAdapter extends ArrayAdapter<Account> {
         }
         viewHolder.binding.tglAccountStatus.setOnCheckedChangeListener(
                 (compoundButton, b) -> {
-                    if (b == isDisabled && activity instanceof OnTglAccountState) {
-                        ((OnTglAccountState) activity).onClickTglAccountState(account, b);
+                    if (b == isDisabled && activity instanceof OnTglAccountState tglAccountState) {
+                        tglAccountState.onClickTglAccountState(account, b);
                     }
                 });
         return view;
diff --git a/src/main/res/layout/item_account.xml b/src/main/res/layout/item_account.xml
index eebd434dc47dbaca60e74136f50d21af9fc897f2..6caff80ed51c8ca4c7323be20002015f530b2a44 100644
--- a/src/main/res/layout/item_account.xml
+++ b/src/main/res/layout/item_account.xml
@@ -8,8 +8,8 @@
         android:layout_height="wrap_content"
         android:background="?selectableItemBackground"
         android:paddingStart="8dp"
-        android:paddingBottom="8dp"
-        android:paddingTop="8dp">
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
 
         <com.makeramen.roundedimageview.RoundedImageView
             android:id="@+id/account_image"
@@ -23,19 +23,19 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_toEndOf="@+id/account_image"
-            android:orientation="vertical"
             android:layout_marginStart="@dimen/avatar_item_distance"
-            android:layout_toStartOf="@+id/tgl_account_status">
+            android:layout_toStartOf="@+id/tgl_account_status"
+            android:layout_toEndOf="@+id/account_image"
+            android:orientation="vertical">
 
             <TextView
-                tools:text="juliet@example.com"
                 android:id="@+id/account_jid"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:scrollHorizontally="false"
                 android:singleLine="true"
-                android:textAppearance="?textAppearanceBodyLarge" />
+                android:textAppearance="?textAppearanceBodyLarge"
+                tools:text="juliet@example.com" />
 
             <TextView
                 android:id="@+id/account_status"
@@ -45,14 +45,14 @@
                 android:textAppearance="?textAppearanceBodyMedium" />
         </LinearLayout>
 
-        <androidx.appcompat.widget.SwitchCompat
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/tgl_account_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:padding="16dp"
-            android:focusable="false" />
+            android:focusable="false"
+            android:padding="16dp" />
 
     </RelativeLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/preference_material_switch.xml b/src/main/res/layout/preference_material_switch.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a18e2a48cef36c70d7e7ca381bec55517eb60a05
--- /dev/null
+++ b/src/main/res/layout/preference_material_switch.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/switchWidget"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@null"
+    android:clickable="false"
+    android:focusable="false" />
diff --git a/src/main/res/values-night/themes.xml b/src/main/res/values-night/themes.xml
index 18591c59eb87bdea65a4dad8caa15cb63fd0b23f..c6a2926e8ff2443987133d14d2f26e69e5141a9e 100644
--- a/src/main/res/values-night/themes.xml
+++ b/src/main/res/values-night/themes.xml
@@ -28,6 +28,7 @@
         <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
+        <item name="preferenceTheme">@style/MaterialPreferenceThemeOverlay</item>
     </style>
 
     <style name="Theme.Conversations3.SplashScreen" parent="@style/Theme.Conversations3">
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 69e0a461ed83013ad13e50c1eea6aeb3a0970f61..0ab08a041d072b5c39182c77cc07a62a9e33a1dc 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -50,5 +50,14 @@
         <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
+        <item name="preferenceTheme">@style/MaterialPreferenceThemeOverlay</item>
+    </style>
+
+    <style name="MaterialPreferenceThemeOverlay" parent="@style/PreferenceThemeOverlay">
+        <item name="switchPreferenceCompatStyle">@style/MaterialSwitchPreference</item>
+    </style>
+
+    <style name="MaterialSwitchPreference" parent="@style/Preference.SwitchPreferenceCompat.Material">
+        <item name="widgetLayout">@layout/preference_material_switch</item>
     </style>
 </resources>
\ No newline at end of file