diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/view/ArtistAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ArtistAdapter.java
index 1102d15a..b1a7d42b 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/view/ArtistAdapter.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ArtistAdapter.java
@@ -49,7 +49,7 @@ public class ArtistAdapter extends ArrayAdapter<Artist> implements SectionIndexe
 
 	public ArtistAdapter(Context context, List<Artist> artists)
 	{
-		super(context, R.layout.artist_list_item, artists);
+		super(context, R.layout.generic_text_list_item, artists);
 
 		layoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
@@ -81,7 +81,7 @@ public class ArtistAdapter extends ArrayAdapter<Artist> implements SectionIndexe
     ) {
         View rowView = convertView;
         if (rowView == null) {
-            rowView = layoutInflater.inflate(R.layout.artist_search_list_item, parent, false);
+            rowView = layoutInflater.inflate(R.layout.generic_text_list_item, parent, false);
         }
         ((TextView) rowView).setText(getItem(position).getName());
 
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java
index f3c7e34a..f21d827d 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java
@@ -48,7 +48,7 @@ public class GenreAdapter extends ArrayAdapter<Genre> implements SectionIndexer
 
 	public GenreAdapter(Context context, List<Genre> genres)
 	{
-		super(context, R.layout.artist_list_item, genres);
+		super(context, R.layout.generic_text_list_item, genres);
 
         layoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
@@ -75,7 +75,7 @@ public class GenreAdapter extends ArrayAdapter<Genre> implements SectionIndexer
     public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
         View rowView = convertView;
         if (rowView == null) {
-            rowView = layoutInflater.inflate(R.layout.artist_list_item, parent, false);
+            rowView = layoutInflater.inflate(R.layout.generic_text_list_item, parent, false);
         }
 
         ((TextView) rowView).setText(getItem(position).getName());
diff --git a/ultrasonic/src/main/res/layout/artist_search_list_item.xml b/ultrasonic/src/main/res/layout/generic_text_list_item.xml
similarity index 100%
rename from ultrasonic/src/main/res/layout/artist_search_list_item.xml
rename to ultrasonic/src/main/res/layout/generic_text_list_item.xml