diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsFragment.java
index bb55cbd6c..0e3e7e044 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsFragment.java
@@ -8,7 +8,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Switch;
 import android.widget.TextView;
 
 import org.briarproject.bramble.api.db.DatabaseExecutor;
@@ -26,6 +25,7 @@ import java.util.logging.Logger;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
+import androidx.appcompat.widget.SwitchCompat;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.ViewModelProviders;
 
@@ -56,7 +56,7 @@ public class ConversationSettingsFragment extends BaseFragment {
 
 	private ConversationSettingsActivity listener;
 	private ConversationViewModel viewModel;
-	private Switch switchDisappearingMessages;
+	private SwitchCompat switchDisappearingMessages;
 	private volatile boolean disappearingMessages = false;
 
 	@Override
diff --git a/briar-android/src/main/res/layout/fragment_conversation_settings.xml b/briar-android/src/main/res/layout/fragment_conversation_settings.xml
index 7d24f6e9f..daa445982 100644
--- a/briar-android/src/main/res/layout/fragment_conversation_settings.xml
+++ b/briar-android/src/main/res/layout/fragment_conversation_settings.xml
@@ -20,7 +20,6 @@
 			app:layout_constraintTop_toTopOf="parent"
 			app:tint="?attr/colorControlNormal" />
 
-
 		<TextView
 			android:id="@+id/buttonLearnMore"
 			android:layout_width="wrap_content"
@@ -68,7 +67,7 @@
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/headlineSetting" />
 
-		<Switch
+		<androidx.appcompat.widget.SwitchCompat
 			android:id="@+id/switchDisappearingMessages"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"