diff --git a/app/src/main/res/drawable-v21/rect_ripple_selector.xml b/app/src/main/res/drawable-v21/rect_ripple_selector.xml
new file mode 100644
index 00000000..aab8a0b6
--- /dev/null
+++ b/app/src/main/res/drawable-v21/rect_ripple_selector.xml
@@ -0,0 +1,9 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:colorControlHighlight">
+
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@drawable/rect_selected"/>
+    <item android:drawable="@drawable/rect_selector"/>
+
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/rect_ripple_selector_dark.xml b/app/src/main/res/drawable-v21/rect_ripple_selector_dark.xml
new file mode 100644
index 00000000..7d597b4c
--- /dev/null
+++ b/app/src/main/res/drawable-v21/rect_ripple_selector_dark.xml
@@ -0,0 +1,9 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:colorControlHighlight">
+
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@drawable/rect_selected_dark"/>
+    <item android:drawable="@drawable/rect_selector_dark"/>
+
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/rect_selector.xml b/app/src/main/res/drawable-v21/rect_selector.xml
new file mode 100644
index 00000000..b60d1e48
--- /dev/null
+++ b/app/src/main/res/drawable-v21/rect_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_selected="true" android:drawable="@drawable/rect_selected" />
+    <item android:drawable="@drawable/transparent" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/rect_selector_dark.xml b/app/src/main/res/drawable-v21/rect_selector_dark.xml
new file mode 100644
index 00000000..70f5f273
--- /dev/null
+++ b/app/src/main/res/drawable-v21/rect_selector_dark.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_selected="true" android:drawable="@drawable/rect_selected_dark" />
+    <item android:drawable="@drawable/transparent" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rect_selected.xml b/app/src/main/res/drawable/rect_selected.xml
new file mode 100644
index 00000000..e874d43b
--- /dev/null
+++ b/app/src/main/res/drawable/rect_selected.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/button_selected" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rect_selected_dark.xml b/app/src/main/res/drawable/rect_selected_dark.xml
new file mode 100644
index 00000000..431ac349
--- /dev/null
+++ b/app/src/main/res/drawable/rect_selected_dark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/button_selected_dark" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rect_selector.xml b/app/src/main/res/drawable/rect_selector.xml
new file mode 100644
index 00000000..7867e338
--- /dev/null
+++ b/app/src/main/res/drawable/rect_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true" android:drawable="@drawable/rect_selected" />
+    <item android:drawable="@drawable/transparent" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rect_selector_dark.xml b/app/src/main/res/drawable/rect_selector_dark.xml
new file mode 100644
index 00000000..fa2978e0
--- /dev/null
+++ b/app/src/main/res/drawable/rect_selector_dark.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true" android:drawable="@drawable/rect_selected_dark" />
+    <item android:drawable="@drawable/transparent" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_playlist.xml b/app/src/main/res/layout/dialog_playlist.xml
index d200dd2d..45292f5e 100644
--- a/app/src/main/res/layout/dialog_playlist.xml
+++ b/app/src/main/res/layout/dialog_playlist.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.mobeta.android.dslv.DragSortListView
+    android:listSelector="?rect_selector"
     android:id="@+id/dragSortListView"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/fragment_albumview.xml b/app/src/main/res/layout/fragment_albumview.xml
index 09c55d2a..bf3b8239 100644
--- a/app/src/main/res/layout/fragment_albumview.xml
+++ b/app/src/main/res/layout/fragment_albumview.xml
@@ -7,6 +7,7 @@
     android:padding="2dp">
 
     <GridView
+        android:listSelector="?rect_selector"
         android:id="@+id/absList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_artist_view.xml b/app/src/main/res/layout/fragment_artist_view.xml
index 954ee290..644cef3e 100644
--- a/app/src/main/res/layout/fragment_artist_view.xml
+++ b/app/src/main/res/layout/fragment_artist_view.xml
@@ -6,6 +6,7 @@
     android:padding="2dp">
 
     <ListView
+        android:listSelector="?rect_selector"
         android:id="@+id/absList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_gridview.xml b/app/src/main/res/layout/fragment_gridview.xml
index f93082cd..6d467207 100644
--- a/app/src/main/res/layout/fragment_gridview.xml
+++ b/app/src/main/res/layout/fragment_gridview.xml
@@ -6,4 +6,5 @@
     android:clipToPadding="false"
     android:divider="@null"
     android:dividerHeight="0dp"
+    android:listSelector="?rect_selector"
     android:scrollbars="none"/>
diff --git a/app/src/main/res/layout/fragment_songview.xml b/app/src/main/res/layout/fragment_songview.xml
index 6aad9a72..088acf07 100644
--- a/app/src/main/res/layout/fragment_songview.xml
+++ b/app/src/main/res/layout/fragment_songview.xml
@@ -7,6 +7,7 @@
     android:padding="2dp">
 
     <ListView
+        android:listSelector="?rect_selector"
         android:id="@+id/absList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/item_artist_view.xml b/app/src/main/res/layout/item_artist_view.xml
index ea97a7cd..5692e17e 100644
--- a/app/src/main/res/layout/item_artist_view.xml
+++ b/app/src/main/res/layout/item_artist_view.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="64dp"
-    android:background="?android:attr/selectableItemBackground"
     android:orientation="horizontal"
     android:paddingLeft="16dp"
     android:paddingRight="16dp">
diff --git a/app/src/main/res/layout/item_playlist.xml b/app/src/main/res/layout/item_playlist.xml
index a8fc0421..cc9eab18 100644
--- a/app/src/main/res/layout/item_playlist.xml
+++ b/app/src/main/res/layout/item_playlist.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="64dp"
-    android:background="?android:attr/selectableItemBackground"
     android:descendantFocusability="blocksDescendants"
     android:orientation="horizontal"
     >
diff --git a/app/src/main/res/layout/item_song.xml b/app/src/main/res/layout/item_song.xml
index 339806cf..8c116c18 100644
--- a/app/src/main/res/layout/item_song.xml
+++ b/app/src/main/res/layout/item_song.xml
@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="64dp"
-    android:background="?android:attr/selectableItemBackground"
     android:descendantFocusability="blocksDescendants"
     android:orientation="horizontal"
     android:paddingLeft="16dp"
diff --git a/app/src/main/res/layout/item_song_view.xml b/app/src/main/res/layout/item_song_view.xml
index 28bccc78..6415f65d 100644
--- a/app/src/main/res/layout/item_song_view.xml
+++ b/app/src/main/res/layout/item_song_view.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="64dp"
-    android:background="?android:attr/selectableItemBackground"
+    android:descendantFocusability="blocksDescendants"
     android:orientation="horizontal"
     android:paddingLeft="16dp">
 
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index acc77a2e..1ad1a20d 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -2,10 +2,12 @@
 
     <style name="Theme.MaterialMusic" parent="Theme.MaterialMusic.Base">
         <item name="round_selector">@drawable/round_ripple_selector_dark</item>
+        <item name="rect_selector">@drawable/rect_ripple_selector_dark</item>
     </style>
 
     <style name="Theme.MaterialMusic.Light" parent="Theme.MaterialMusic.Base.Light">
-        <!--<item name="round_selector">@drawable/round_ripple_selector</item>-->
+        <item name="round_selector">@drawable/round_ripple_selector</item>
+        <item name="rect_selector">@drawable/rect_ripple_selector</item>
     </style>
 
     <style name="Theme.MaterialMusic.Notification" parent="@android:style/TextAppearance.Material.Notification"/>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 71441d50..cc965755 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -7,4 +7,5 @@
     <attr name="fab_color_pressed" format="color"/>
     <attr name="list_selector" format="reference"/>
     <attr name="round_selector" format="reference"/>
+    <attr name="rect_selector" format="reference"/>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index b5e195dd..1b4a7311 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -21,6 +21,7 @@
 
         <item name="list_selector">@drawable/list_selector_dark</item>
         <item name="round_selector">@drawable/round_selector_dark</item>
+        <item name="rect_selector">@drawable/rect_selector_dark</item>
 
         <item name="md_dark_theme">true</item>
 
@@ -46,6 +47,7 @@
 
         <item name="list_selector">@drawable/list_selector</item>
         <item name="round_selector">@drawable/round_selector</item>
+        <item name="rect_selector">@drawable/rect_selector</item>
 
         <item name="md_dark_theme">false</item>
     </style>