diff --git a/mastodon/src/main/res/drawable/bg_edittext_dark.xml b/mastodon/src/main/res/drawable/bg_edittext_dark.xml
index 15df6506a..f5113702d 100644
--- a/mastodon/src/main/res/drawable/bg_edittext_dark.xml
+++ b/mastodon/src/main/res/drawable/bg_edittext_dark.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-	<solid android:color="@color/gray_800"/>
+	<solid android:color="?colorWindowBackground"/>
 	<corners android:radius="10dp"/>
 	<padding android:top="16dp" android:left="16dp" android:right="16dp" android:bottom="16dp"/>
 </shape>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/header_onboarding_instance_catalog.xml b/mastodon/src/main/res/layout/header_onboarding_instance_catalog.xml
index 58081e0fc..9a35b6ba4 100644
--- a/mastodon/src/main/res/layout/header_onboarding_instance_catalog.xml
+++ b/mastodon/src/main/res/layout/header_onboarding_instance_catalog.xml
@@ -44,18 +44,19 @@
 
 	<EditText
 		android:id="@+id/search_edit"
+		style="@android:style/Widget.EditText"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:inputType="textFilter|textNoSuggestions"
-		android:singleLine="true"
-		android:imeOptions="actionGo"
 		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
 		android:layout_marginTop="19dp"
+		android:layout_marginRight="16dp"
 		android:layout_marginBottom="3dp"
 		android:drawableStart="@drawable/ic_fluent_search_20_regular"
 		android:drawablePadding="8dp"
 		android:drawableTint="?android:textColorSecondary"
-		android:hint="@string/search_communities"/>
+		android:hint="@string/search_communities"
+		android:imeOptions="actionGo"
+		android:inputType="textFilter|textNoSuggestions"
+		android:singleLine="true" />
 
 </LinearLayout>
\ No newline at end of file