diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
index 32f721c3a..4132cfaf2 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
@@ -124,6 +124,7 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment {
 		super.onViewCreated(view, savedInstanceState);
 		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorWindowBackground));
 		list.setItemAnimator(new BetterItemAnimator());
+		((UsableRecyclerView) list).setSelector(null);
 	}
 
 	@Override
diff --git a/mastodon/src/main/res/drawable/bg_search_button.xml b/mastodon/src/main/res/drawable/bg_search_button.xml
index 9b7d630ff..717bda7ce 100644
--- a/mastodon/src/main/res/drawable/bg_search_button.xml
+++ b/mastodon/src/main/res/drawable/bg_search_button.xml
@@ -2,10 +2,5 @@
 <ripple
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:color="?android:attr/colorControlHighlight">
-	<item>
-		<shape>
-			<solid android:color="?colorSearchField"/>
-			<corners android:radius="6dp"/>
-		</shape>
-	</item>
+	<item android:drawable="@drawable/bg_search_field" />
 </ripple>
diff --git a/mastodon/src/main/res/layout/display_item_file.xml b/mastodon/src/main/res/layout/display_item_file.xml
index f206777ba..e428abf26 100644
--- a/mastodon/src/main/res/layout/display_item_file.xml
+++ b/mastodon/src/main/res/layout/display_item_file.xml
@@ -16,7 +16,7 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="16dp"
             android:layout_marginVertical="4dp"
-            android:background="@drawable/bg_search_field"
+            android:background="@drawable/bg_search_button"
             android:paddingVertical="12dp"
             android:orientation="horizontal">
 
diff --git a/mastodon/src/main/res/layout/item_instance_custom.xml b/mastodon/src/main/res/layout/item_instance_custom.xml
index c8cf010f6..25a2058a3 100644
--- a/mastodon/src/main/res/layout/item_instance_custom.xml
+++ b/mastodon/src/main/res/layout/item_instance_custom.xml
@@ -8,7 +8,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/bg_search_field">
+        android:background="@drawable/bg_search_button">
         <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:tools="http://schemas.android.com/tools"
             android:layout_width="match_parent"